Fix Argo CD's scylla cluster yml file formatting

This commit is contained in:
2025-08-16 23:26:45 -03:00
parent 455dc27743
commit a67b4f6a3d
8 changed files with 106 additions and 99 deletions
+94 -94
View File
@@ -21,97 +21,97 @@ spec:
- fs.aio-max-nr=30000000 - fs.aio-max-nr=30000000
datacenter: datacenter:
name: ge-dc1 name: ge-dc1
racks: racks:
- name: ge-dc1-rack1 - name: ge-dc1-rack1
members: 1 members: 1
scyllaConfig: scylladb-config scyllaConfig: scylladb-config
storage: storage:
capacity: 50Gi capacity: 50Gi
storageClassName: scylladb-local-xfs storageClassName: scylladb-local-xfs
resources: resources:
requests: requests:
cpu: 1 cpu: 1
memory: 8Gi memory: 8Gi
limits: limits:
cpu: 1 cpu: 1
memory: 8Gi memory: 8Gi
placement: placement:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: topology.kubernetes.io/zone - key: topology.kubernetes.io/zone
operator: In operator: In
values: values:
- ge-dc1-rack1 - ge-dc1-rack1
- key: scylla.scylladb.com/node-type - key: scylla.scylladb.com/node-type
operator: In operator: In
values: values:
- scylla - scylla
tolerations: tolerations:
- key: scylla-operator.scylladb.com/dedicated - key: scylla-operator.scylladb.com/dedicated
operator: Equal operator: Equal
value: scyllaclusters value: scyllaclusters
effect: NoSchedule effect: NoSchedule
- name: ge-dc1-rack2 - name: ge-dc1-rack2
members: 1 members: 1
scyllaConfig: scylladb-config scyllaConfig: scylladb-config
storage: storage:
capacity: 50Gi capacity: 50Gi
storageClassName: scylladb-local-xfs storageClassName: scylladb-local-xfs
resources: resources:
requests: requests:
cpu: 1 cpu: 1
memory: 8Gi memory: 8Gi
limits: limits:
cpu: 1 cpu: 1
memory: 8Gi memory: 8Gi
placement: placement:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: topology.kubernetes.io/zone - key: topology.kubernetes.io/zone
operator: In operator: In
values: values:
- ge-dc1-rack2 - ge-dc1-rack2
- key: scylla.scylladb.com/node-type - key: scylla.scylladb.com/node-type
operator: In operator: In
values: values:
- scylla - scylla
tolerations: tolerations:
- key: scylla-operator.scylladb.com/dedicated - key: scylla-operator.scylladb.com/dedicated
operator: Equal operator: Equal
value: scyllaclusters value: scyllaclusters
effect: NoSchedule effect: NoSchedule
- name: ge-dc1-rack3 - name: ge-dc1-rack3
members: 1 members: 1
scyllaConfig: scylladb-config scyllaConfig: scylladb-config
storage: storage:
capacity: 50Gi capacity: 50Gi
storageClassName: scylladb-local-xfs storageClassName: scylladb-local-xfs
resources: resources:
requests: requests:
cpu: 1 cpu: 1
memory: 8Gi memory: 8Gi
limits: limits:
cpu: 1 cpu: 1
memory: 8Gi memory: 8Gi
placement: placement:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: topology.kubernetes.io/zone - key: topology.kubernetes.io/zone
operator: In operator: In
values: values:
- ge-dc1-rack3 - ge-dc1-rack3
- key: scylla.scylladb.com/node-type - key: scylla.scylladb.com/node-type
operator: In operator: In
values: values:
- scylla - scylla
tolerations: tolerations:
- key: scylla-operator.scylladb.com/dedicated - key: scylla-operator.scylladb.com/dedicated
operator: Equal operator: Equal
value: scyllaclusters value: scyllaclusters
effect: NoSchedule effect: NoSchedule
+3
View File
@@ -1,3 +1,6 @@
set -euo pipefail
set -x
uv run ansible-playbook -i inventory-dev.ini playbooks/01-setup.yml uv run ansible-playbook -i inventory-dev.ini playbooks/01-setup.yml
uv run ansible-playbook -i inventory-dev.ini playbooks/02-copy-k8s-files.yml uv run ansible-playbook -i inventory-dev.ini playbooks/02-copy-k8s-files.yml
uv run ansible-playbook -i inventory-dev.ini playbooks/03-argo-cd.yml uv run ansible-playbook -i inventory-dev.ini playbooks/03-argo-cd.yml
+1
View File
@@ -1,6 +1,7 @@
- name: Set up ArgoCD - name: Set up ArgoCD
hosts: init hosts: init
become: true become: true
gather_facts: false
tasks: tasks:
- name: Create ArgoCD namespace - name: Create ArgoCD namespace
kubernetes.core.k8s: kubernetes.core.k8s:
+2 -2
View File
@@ -3,7 +3,7 @@
become: true become: true
gather_facts: false gather_facts: false
vars_files: vars_files:
- 00-secrets.yml - 00-vault.yml
tasks: tasks:
- name: Add private Git repo credentials to ArgoCD - name: Add private Git repo credentials to ArgoCD
kubernetes.core.k8s: kubernetes.core.k8s:
@@ -12,7 +12,7 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: payphone-repo-creds name: payphone-repo
namespace: argocd namespace: argocd
labels: labels:
argocd.argoproj.io/secret-type: repository argocd.argoproj.io/secret-type: repository
+1
View File
@@ -1,5 +1,6 @@
- name: Set up Cert-Manager - name: Set up Cert-Manager
hosts: init hosts: init
gather_facts: false
become: true become: true
vars: vars:
cert_manager_ns: cert-manager cert_manager_ns: cert-manager
+1
View File
@@ -1,5 +1,6 @@
- name: Set up Prometheus operator - name: Set up Prometheus operator
hosts: init hosts: init
gather_facts: false
become: true become: true
vars: vars:
prometheus_crds: prometheus_crds:
+4 -3
View File
@@ -47,7 +47,7 @@
- name: Find Scylla CSI Driver K8s YAMLs on Remote Host - name: Find Scylla CSI Driver K8s YAMLs on Remote Host
ansible.builtin.find: ansible.builtin.find:
paths: /tmp/k8s/scylla paths: /tmp/k8s/ansible/scylla
patterns: "05-*.yml" patterns: "05-*.yml"
file_type: file file_type: file
register: scylla_csi_driver_files register: scylla_csi_driver_files
@@ -66,8 +66,8 @@
kubectl -n=local-csi-driver rollout status --timeout=10m daemonset.apps/local-csi-driver kubectl -n=local-csi-driver rollout status --timeout=10m daemonset.apps/local-csi-driver
changed_when: false changed_when: false
- name: Label current node as Scylla - name: Label All Nodes as Scylla
loop: groups['all'] loop: "{{ groups['all'] }}"
kubernetes.core.k8s: kubernetes.core.k8s:
api_version: v1 api_version: v1
kind: Node kind: Node
@@ -76,5 +76,6 @@
metadata: metadata:
labels: labels:
scylla.scylladb.com/node-type: scylla scylla.scylladb.com/node-type: scylla
opology.kubernetes.io/zone: "{{ hostvars[item].rack }}"
kubeconfig: /etc/rancher/k3s/k3s.yaml kubeconfig: /etc/rancher/k3s/k3s.yaml
state: present state: present