Fix Argo CD's scylla cluster yml file formatting

k8s/argo-cd/scylla/01-scylla-cluster.yml

@@ -21,97 +21,97 @@ spec:
   - fs.aio-max-nr=30000000
   datacenter:
     name: ge-dc1
-  racks:
-  - name: ge-dc1-rack1
-    members: 1
-    scyllaConfig: scylladb-config
-    storage:
-      capacity: 50Gi
-      storageClassName: scylladb-local-xfs
-    resources:
-      requests:
-        cpu: 1
-        memory: 8Gi
-      limits:
-        cpu: 1
-        memory: 8Gi
-    placement:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: topology.kubernetes.io/zone
-              operator: In
-              values:
-              - ge-dc1-rack1
-            - key: scylla.scylladb.com/node-type
-              operator: In
-              values:
-              - scylla
-      tolerations:
-      - key: scylla-operator.scylladb.com/dedicated
-        operator: Equal
-        value: scyllaclusters
-        effect: NoSchedule
-  - name: ge-dc1-rack2
-    members: 1
-    scyllaConfig: scylladb-config
-    storage:
-      capacity: 50Gi
-      storageClassName: scylladb-local-xfs
-    resources:
-      requests:
-        cpu: 1
-        memory: 8Gi
-      limits:
-        cpu: 1
-        memory: 8Gi
-    placement:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: topology.kubernetes.io/zone
-              operator: In
-              values:
-              - ge-dc1-rack2
-            - key: scylla.scylladb.com/node-type
-              operator: In
-              values:
-              - scylla
-      tolerations:
-      - key: scylla-operator.scylladb.com/dedicated
-        operator: Equal
-        value: scyllaclusters
-        effect: NoSchedule
-  - name: ge-dc1-rack3
-    members: 1
-    scyllaConfig: scylladb-config
-    storage:
-      capacity: 50Gi
-      storageClassName: scylladb-local-xfs
-    resources:
-      requests:
-        cpu: 1
-        memory: 8Gi
-      limits:
-        cpu: 1
-        memory: 8Gi
-    placement:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: topology.kubernetes.io/zone
-              operator: In
-              values:
-              - ge-dc1-rack3
-            - key: scylla.scylladb.com/node-type
-              operator: In
-              values:
-              - scylla
-      tolerations:
-      - key: scylla-operator.scylladb.com/dedicated
-        operator: Equal
-        value: scyllaclusters
-        effect: NoSchedule
+    racks:
+    - name: ge-dc1-rack1
+      members: 1
+      scyllaConfig: scylladb-config
+      storage:
+        capacity: 50Gi
+        storageClassName: scylladb-local-xfs
+      resources:
+        requests:
+          cpu: 1
+          memory: 8Gi
+        limits:
+          cpu: 1
+          memory: 8Gi
+      placement:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: topology.kubernetes.io/zone
+                operator: In
+                values:
+                - ge-dc1-rack1
+              - key: scylla.scylladb.com/node-type
+                operator: In
+                values:
+                - scylla
+        tolerations:
+        - key: scylla-operator.scylladb.com/dedicated
+          operator: Equal
+          value: scyllaclusters
+          effect: NoSchedule
+    - name: ge-dc1-rack2
+      members: 1
+      scyllaConfig: scylladb-config
+      storage:
+        capacity: 50Gi
+        storageClassName: scylladb-local-xfs
+      resources:
+        requests:
+          cpu: 1
+          memory: 8Gi
+        limits:
+          cpu: 1
+          memory: 8Gi
+      placement:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: topology.kubernetes.io/zone
+                operator: In
+                values:
+                - ge-dc1-rack2
+              - key: scylla.scylladb.com/node-type
+                operator: In
+                values:
+                - scylla
+        tolerations:
+        - key: scylla-operator.scylladb.com/dedicated
+          operator: Equal
+          value: scyllaclusters
+          effect: NoSchedule
+    - name: ge-dc1-rack3
+      members: 1
+      scyllaConfig: scylladb-config
+      storage:
+        capacity: 50Gi
+        storageClassName: scylladb-local-xfs
+      resources:
+        requests:
+          cpu: 1
+          memory: 8Gi
+        limits:
+          cpu: 1
+          memory: 8Gi
+      placement:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: topology.kubernetes.io/zone
+                operator: In
+                values:
+                - ge-dc1-rack3
+              - key: scylla.scylladb.com/node-type
+                operator: In
+                values:
+                - scylla
+        tolerations:
+        - key: scylla-operator.scylladb.com/dedicated
+          operator: Equal
+          value: scyllaclusters
+          effect: NoSchedule

playbooks/00-run-dev.sh

@@ -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/02-copy-k8s-files.yml
 uv run ansible-playbook -i inventory-dev.ini playbooks/03-argo-cd.yml

playbooks/03-argo-cd.yml

@@ -1,6 +1,7 @@
 - name: Set up ArgoCD
   hosts: init
   become: true
+  gather_facts: false
   tasks:
     - name: Create ArgoCD namespace
       kubernetes.core.k8s:

playbooks/04-secrets.yml

@@ -3,7 +3,7 @@
   become: true
   gather_facts: false
   vars_files:
-    - 00-secrets.yml
+    - 00-vault.yml
   tasks:
     - name: Add private Git repo credentials to ArgoCD
       kubernetes.core.k8s:
@@ -12,7 +12,7 @@
           apiVersion: v1
           kind: Secret
           metadata:
-            name: payphone-repo-creds
+            name: payphone-repo
             namespace: argocd
             labels:
               argocd.argoproj.io/secret-type: repository

playbooks/05-cert-manager.yml

@@ -1,5 +1,6 @@
 - name: Set up Cert-Manager
   hosts: init
+  gather_facts: false
   become: true
   vars:
     cert_manager_ns: cert-manager

playbooks/06-prometheus-operator.yml

@@ -1,5 +1,6 @@
 - name: Set up Prometheus operator
   hosts: init
+  gather_facts: false
   become: true
   vars:
     prometheus_crds:

playbooks/07-scylla-operator.yml

@@ -47,7 +47,7 @@
 
     - name: Find Scylla CSI Driver K8s YAMLs on Remote Host
       ansible.builtin.find:
-        paths: /tmp/k8s/scylla
+        paths: /tmp/k8s/ansible/scylla
         patterns: "05-*.yml"
         file_type: file
       register: scylla_csi_driver_files
@@ -66,8 +66,8 @@
         kubectl -n=local-csi-driver rollout status --timeout=10m daemonset.apps/local-csi-driver
       changed_when: false
 
-    - name: Label current node as Scylla
-      loop: groups['all']
+    - name: Label All Nodes as Scylla
+      loop: "{{ groups['all'] }}"
       kubernetes.core.k8s:
         api_version: v1
         kind: Node
@@ -76,5 +76,6 @@
           metadata:
             labels:
               scylla.scylladb.com/node-type: scylla
+              opology.kubernetes.io/zone: "{{ hostvars[item].rack }}"
         kubeconfig: /etc/rancher/k3s/k3s.yaml
         state: present