Push updates

.gitignore

@@ -2,3 +2,5 @@
 /.venv
 
 .env
+
+00-vault-pwd.txt

inventory.ini

@@ -1,8 +1,16 @@
 [init]
-p4 ansible_host=p4.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack1
+p1 ansible_host=p1.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack1
 
 [master]
-p5 ansible_host=p5.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack2
+p2 ansible_host=p2.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack2
+p3 ansible_host=p3.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack3
 
 [worker]
+p4 ansible_host=p4.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack1
+p5 ansible_host=p5.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack2
 p6 ansible_host=p6.vps.nyeki.dev ansible_user=root rack=ge-dc1-rack3
+
+[scylla]
+p4
+p5
+p6

k8s/ansible/scylla/04-scylla-node-config.yml

@@ -7,7 +7,7 @@ spec:
     loopDevices:
     - name: persistent-volumes
       imagePath: /var/lib/persistent-volumes.img
-      size: 50Gi
+      size: 25Gi
     filesystems:
     - device: /dev/loops/persistent-volumes
       type: xfs

playbooks/00-run-all.sh

@@ -0,0 +1,12 @@
+set -euo pipefail
+set -x
+
+uv run ansible-playbook -i inventory.ini playbooks/01-setup.yml
+uv run ansible-playbook -i inventory.ini playbooks/02-copy-k8s-files.yml
+uv run ansible-playbook -i inventory.ini playbooks/03-argo-cd.yml
+uv run ansible-playbook -i inventory.ini playbooks/04-secrets.yml --vault-password-file playbooks/00-vault-pwd.txt
+uv run ansible-playbook -i inventory.ini playbooks/05-cert-manager.yml
+uv run ansible-playbook -i inventory.ini playbooks/06-prometheus-operator.yml
+uv run ansible-playbook -i inventory.ini playbooks/07-scylla-operator.yml
+uv run ansible-playbook -i inventory.ini playbooks/08-scylla-cluster.yml
+uv run ansible-playbook -i inventory.ini playbooks/09-scylla-manager.yml

playbooks/00-run-dev.sh

@@ -1,12 +0,0 @@
-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
-uv run ansible-playbook -i inventory-dev.ini playbooks/04-secrets.yml --ask-vault-pass
-uv run ansible-playbook -i inventory-dev.ini playbooks/05-cert-manager.yml
-uv run ansible-playbook -i inventory-dev.ini playbooks/06-prometheus-operator.yml
-uv run ansible-playbook -i inventory-dev.ini playbooks/07-scylla-operator.yml
-uv run ansible-playbook -i inventory-dev.ini playbooks/08-scylla-cluster.yml
-uv run ansible-playbook -i inventory-dev.ini playbooks/09-scylla-manager.yml

playbooks/01-setup.yml

@@ -114,3 +114,48 @@
       delay: 30
       until: wait_nodes.rc == 0
       changed_when: false
+
+- name: Set Up Node Labels and Taints
+  hosts: init
+  become: true
+  tasks:
+    - name: Set Rack Tags to All Nodes
+      loop: "{{ groups['all'] }}"
+      kubernetes.core.k8s:
+        api_version: v1
+        kind: Node
+        name: "{{ item }}"
+        definition:
+          metadata:
+            labels:
+              topology.kubernetes.io/zone: "{{ hostvars[item].rack }}"
+        kubeconfig: /etc/rancher/k3s/k3s.yaml
+        state: present
+
+    - name: Set Scylla Tags to Scylla Nodes
+      loop: "{{ groups['scylla'] }}"
+      kubernetes.core.k8s:
+        api_version: v1
+        kind: Node
+        name: "{{ item }}"
+        definition:
+          metadata:
+            labels:
+              scylla.scylladb.com/node-type: scylla
+          spec:
+            taints:
+              - key: scylla-operator.scylladb.com/dedicated
+                value: scyllaclusters
+                effect: NoSchedule
+        kubeconfig: /etc/rancher/k3s/k3s.yaml
+        state: present
+
+- name: Create Containerd Socket Symlink
+  hosts: all
+  become: true
+  tasks:
+    - name: Create Containerd Symlink
+      ansible.builtin.command: |
+        ln -s /run/k3s/containerd/containerd.sock /run/containerd/containerd.sock
+      args:
+        creates: /run/containerd/containerd.sock

playbooks/04-secrets.yml

@@ -12,7 +12,7 @@
           apiVersion: v1
           kind: Secret
           metadata:
-            name: payphone-repo
+            name: payphone-repo-creds
             namespace: argocd
             labels:
               argocd.argoproj.io/secret-type: repository

playbooks/07-scylla-operator.yml

@@ -65,17 +65,3 @@
       ansible.builtin.command: |
         kubectl -n=local-csi-driver rollout status --timeout=10m daemonset.apps/local-csi-driver
       changed_when: false
-
-    - name: Label All Nodes as Scylla
-      loop: "{{ groups['all'] }}"
-      kubernetes.core.k8s:
-        api_version: v1
-        kind: Node
-        name: "{{ item }}"
-        definition:
-          metadata:
-            labels:
-              scylla.scylladb.com/node-type: scylla
-              opology.kubernetes.io/zone: "{{ hostvars[item].rack }}"
-        kubeconfig: /etc/rancher/k3s/k3s.yaml
-        state: present

playbooks/08-scylla-cluster.yml

@@ -14,7 +14,7 @@
       ansible.builtin.command: |
         kubectl -n scylla rollout status statefulset/{{ item }} --timeout=10m
       loop:
-        - ge-dc1-rack1
+        - scylladb-ge-dc1-ge-dc1-rack1
-        - ge-dc1-rack2
+        - scylladb-ge-dc1-ge-dc1-rack2
-        - ge-dc1-rack3
+        - scylladb-ge-dc1-ge-dc1-rack3
       changed_when: false