feat(#782): added support for multiple sakura instances

Now it is possible to deploy multiple sakura instances
within the kubernetes.

Signed-off-by: Tobias Anker <tobias.anker@kitsunemimi.moe>

Author: kitsudaiki

CHANGELOG.md

@@ -6,10 +6,18 @@
 
 - Vagrantfile with ansible playbook to deploy multiple virtual machines with a kubernestes with fully deployed ainari-setup and sdk-api-test
 - image pull-policy can now be changed by the helm-values
+- support other namespaces thand "default"
+- support for multiple sakura instances
 
 ### Changed
 
 - changed the image-build process for the new vagrant-test-setup
+- sakura and onsen are now statefulsets within the kubernetes setup
+
+### Fixed
+
+- fixed broken version-output of the pre-build docker images
+
 
 ## v0.10.0
 

deploy/k8s/ainari/templates/sakura/sakura-config.yaml

@@ -12,18 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- $root := . }}
+{{- $replicas := int .Values.sakura.replica_count }}
+{{- range $i := until $replicas }}
 apiVersion: v1
+kind: ConfigMap
 metadata:
-  name: sakura-config
+  name: sakura-config-{{ $i }}
 data:
   sakura.toml: |+
     debug = true
     log_path = ""
     skip_tls_verification = true
-    address = "https://sakura-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
+    address = "https://sakura-{{ $i }}.sakura-tls-service.{{ $root.Release.Namespace }}.svc.cluster.local:8443"
 
     [processing]
-    max_number_of_threads = {{ .Values.sakura.processing.max_number_of_threads }}
+    max_number_of_threads = {{ $root.Values.sakura.processing.max_number_of_threads }}
 
     [storage]
     tempfile_location = "/tmp/sakura"
@@ -38,6 +42,6 @@ data:
     file_path = "/etc/ainari/sakura/sakura_db"
     
     [miko]
-    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
-
-kind: ConfigMap
+    address = "https://miko-tls-service.{{ $root.Release.Namespace }}.svc.cluster.local:8443"
+---  {{/* This separator is mandatory inside the loop. otherwise only one instance is created */}}
+{{- end }}

deploy/k8s/ainari/templates/sakura/sakura-ingress.yaml

@@ -19,6 +19,7 @@ metadata:
   labels:
     app: sakura
 spec:
+  serviceName: sakura-tls-service
   replicas: {{ .Values.sakura.replica_count }}
   selector:
     matchLabels:
@@ -46,6 +47,24 @@ spec:
                 values:
                 - sakura
             topologyKey: kubernetes.io/hostname
+
+      initContainers:
+      - name: copy-config
+        image: busybox
+        command:
+          - sh
+          - -c
+          - |
+            ORDINAL=${HOSTNAME##*-}
+            mkdir -p /etc/ainari
+            ls /configs
+            cp /configs/sakura-config-${ORDINAL}/sakura.toml /etc/ainari/sakura.toml
+        volumeMounts:
+        - name: sakura-configs
+          mountPath: /configs
+        - name: sakura-config
+          mountPath: /etc/ainari
+
       containers:
       - name: sakura
         image: {{ .Values.sakura.docker.repository }}:{{ .Values.sakura.docker.tag }}
@@ -63,13 +82,12 @@ spec:
             secretKeyRef:
               name: sakura-registration-key
               key: sakura_retistration_key
+
         volumeMounts:
         - name: data-volume
           mountPath: /etc/ainari/sakura/
         - name: sakura-config
-          mountPath: /etc/ainari/sakura.toml
-          subPath: sakura.toml
-          readOnly: true
+          mountPath: /etc/ainari
         - name: wg-secret
           mountPath: /etc/wireguard
           readOnly: true
@@ -81,6 +99,8 @@ spec:
 
       - name: tls-termination
         image: nginx:latest
+        ports:
+        - containerPort: 8443
         volumeMounts:
         - name: tls-certs
           mountPath: /etc/nginx/certs
@@ -93,9 +113,18 @@ spec:
             cpu: "500m"
 
       volumes:
+        - name: sakura-configs
+          projected:
+            sources:
+            {{- range $i := until (.Values.sakura.replica_count | int) }}
+            - configMap:
+                name: sakura-config-{{ $i }}
+                items:
+                - key: sakura.toml
+                  path: sakura-config-{{ $i }}/sakura.toml
+            {{- end }}
         - name: sakura-config
-          configMap:
-            name: sakura-config
+          emptyDir: {}
         - name: tls-certs
           secret:
             secretName: sakura-selfsigned-secret

deploy/k8s/ainari/templates/sakura/sakura-pv.yml

@@ -17,13 +17,13 @@ kind: Service
 metadata:
   name: sakura-tls-service
   labels:
-    run: sakura
+    app: sakura
 spec:
+  clusterIP: None
   selector:
     app: sakura
   ports:
     - name: input
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ClusterIP

deploy/k8s/ainari/templates/sakura/sakura-pvc.yml

@@ -9,3 +9,7 @@ miko:
   token:
     data: "this-is-a-test"
 
+
+# sakura:
+#   replica_count: 3
+

deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml

@@ -202,7 +202,7 @@
 
     - name: Create ainari namespace
       ansible.builtin.shell: |
-        kubectl create namespace ainari || yes
+        kubectl create namespace ainari || true
 
     - name: Ensure cert-manager namespace exists
       ansible.builtin.shell: |
@@ -264,7 +264,7 @@
 
     - name: Check if Helm release of ainari exists
       ansible.builtin.command:
-        cmd: helm status ainari
+        cmd: helm status -n ainari ainari
       register: helm_status
       failed_when: false
       changed_when: false

deploy/k8s/ainari/templates/sakura/sakura-tls-service.yaml

@@ -27,7 +27,7 @@ hanami:
 
 
 sakura:
-  replica_count: 1
+  replica_count: 2
   docker:
     tag: "local_test"
     repository: "kitsudaiki/sakura"