Merge pull request #798 from kitsudaiki/feat/add-probes-to-kubernetes-setup2

kitsudaiki · web-flow · commit 921faa471028 · 2026-01-04T21:47:24.000+01:00
related issue: #594
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -985,7 +985,7 @@ jobs:
           sudo apt-get install -y wireguard-tools
           pip3 install jinja2
           cd ${GITHUB_REPOSITORY#*/}/deploy/k8s
-          python3 wg_gen.py
+          python3 wg_gen.py --namespace default
       -
         name: Label nodes
         run: |
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -174,7 +174,7 @@
         "filename": "deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml",
         "hashed_secret": "a1b78300299f72872366d7a0c32a5f19512c9d32",
         "is_verified": false,
-        "line_number": 96
+        "line_number": 117
       }
     ],
     "deploy/k8s/ainari/templates/internal-api-key-secret.yaml": [
@@ -201,14 +201,14 @@
         "filename": "deploy/k8s/ainari/templates/miko/miko-deployment.yaml",
         "hashed_secret": "a8fd869cf678cfd350b2aa8fb2bc4e030c75e11d",
         "is_verified": false,
-        "line_number": 80
+        "line_number": 101
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/k8s/ainari/templates/miko/miko-deployment.yaml",
         "hashed_secret": "298bddaea9b4590f81a8c8c5629e7a6417415c64",
         "is_verified": false,
-        "line_number": 86
+        "line_number": 107
       }
     ],
     "deploy/k8s/ainari/templates/omamori/omamori-certificate.yaml": [
@@ -235,7 +235,7 @@
         "filename": "deploy/k8s/ainari/templates/omamori/omamori-deployment.yaml",
         "hashed_secret": "b42d97659f427e4287f30f0cd8bdc2ac5d3b10b5",
         "is_verified": false,
-        "line_number": 91
+        "line_number": 112
       }
     ],
     "deploy/k8s/ainari/templates/onsen/onsen-statefulset.yaml": [
@@ -262,14 +262,14 @@
         "filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
         "hashed_secret": "04f5ffaec2d0437e26b1e224de6915e15247989f",
         "is_verified": false,
-        "line_number": 108
+        "line_number": 128
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
         "hashed_secret": "8ecbfb09891f75ade7c286346fe355113e680af7",
         "is_verified": false,
-        "line_number": 114
+        "line_number": 134
       }
     ],
     "deploy/k8s/ainari/templates/sakura/sakura-certificate.yaml": [
@@ -287,14 +287,14 @@
         "filename": "deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml",
         "hashed_secret": "1db3a3e51c405b71091fd7885f714805187b5785",
         "is_verified": false,
-        "line_number": 130
+        "line_number": 151
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml",
         "hashed_secret": "845e1c68668309b563d8a17950b9529de8b3616e",
         "is_verified": false,
-        "line_number": 136
+        "line_number": 157
       }
     ],
     "deploy/k8s/ainari/templates/torii/torii-certificate.yaml": [
@@ -312,7 +312,7 @@
         "filename": "deploy/k8s/ainari/templates/torii/torii-deployment.yaml",
         "hashed_secret": "88f7f6dda5e81f2e7958ef4d21771d2c66f2351a",
         "is_verified": false,
-        "line_number": 91
+        "line_number": 112
       }
     ],
     "deploy/k8s/wg_gen.py": [
@@ -604,5 +604,5 @@
       }
     ]
   },
-  "generated_at": "2026-01-04T15:26:24Z"
+  "generated_at": "2026-01-04T20:37:39Z"
 }
diff --git a/deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml b/deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml
@@ -70,6 +70,27 @@ spec:
           mountPath: /etc/ainari/hanami.toml
           subPath: hanami.toml
           readOnly: true
+        readinessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:11418/v1alpha/is_ready
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 2
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:11418/v1alpha/is_ready
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 2
+          failureThreshold: 3
 
       - name: tls-termination
         image: nginx:latest
diff --git a/deploy/k8s/ainari/templates/miko/miko-deployment.yaml b/deploy/k8s/ainari/templates/miko/miko-deployment.yaml
@@ -57,6 +57,27 @@ spec:
           mountPath: /etc/ainari/token_key
           subPath: token-key
           readOnly: true
+        readinessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10417/v1alpha/is_ready
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 2
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10417/v1alpha/is_ready
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 2
+          failureThreshold: 3
 
       - name: tls-termination
         image: nginx:latest
diff --git a/deploy/k8s/ainari/templates/omamori/omamori-deployment.yaml b/deploy/k8s/ainari/templates/omamori/omamori-deployment.yaml
@@ -65,6 +65,27 @@ spec:
           mountPath: /etc/ainari/omamori.toml
           subPath: omamori.toml
           readOnly: true
+        readinessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10421/v1alpha/is_ready
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 2
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10421/v1alpha/is_ready
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 2
+          failureThreshold: 3
 
       - name: tls-termination
         image: nginx:latest
diff --git a/deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml b/deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml
@@ -80,7 +80,27 @@ spec:
             add:
               - NET_ADMIN
               - SYS_MODULE
-
+        readinessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10416/v1alpha/is_ready
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 2
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10416/v1alpha/is_ready
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 2
+          failureThreshold: 3
                 
 
       - name: tls-termination
diff --git a/deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml b/deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml
@@ -96,6 +96,27 @@ spec:
             add:
               - NET_ADMIN
               - SYS_MODULE
+        readinessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:11420/v1alpha/is_ready
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 2
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:11420/v1alpha/is_ready
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 2
+          failureThreshold: 3
 
       - name: tls-termination
         image: nginx:latest
diff --git a/deploy/k8s/ainari/templates/torii/torii-deployment.yaml b/deploy/k8s/ainari/templates/torii/torii-deployment.yaml
@@ -65,7 +65,28 @@ spec:
           mountPath: /etc/ainari/torii.toml
           subPath: torii.toml
           readOnly: true
-
+        readinessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10419/v1alpha/is_ready
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 2
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          exec:
+            command:
+            - curl
+            - --fail
+            - localhost:10419/v1alpha/is_ready
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          timeoutSeconds: 2
+          failureThreshold: 3
+  
       - name: tls-termination
         image: nginx:latest
         volumeMounts:
diff --git a/dockerfiles/Dockerfile_hanami b/dockerfiles/Dockerfile_hanami
@@ -39,7 +39,7 @@ FROM debian:12.12-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed0
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
-    apt-get install -y openssl libsqlite3-0 && \
+    apt-get install -y curl openssl libsqlite3-0 && \
     apt-get clean autoclean &&\
     apt-get autoremove --yes
 
diff --git a/dockerfiles/Dockerfile_miko b/dockerfiles/Dockerfile_miko
@@ -39,7 +39,7 @@ FROM debian:12.12-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed0
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
-    apt-get install -y openssl libsqlite3-0 && \
+    apt-get install -y curl openssl libsqlite3-0 && \
     apt-get clean autoclean &&\
     apt-get autoremove --yes
 
diff --git a/dockerfiles/Dockerfile_omamori b/dockerfiles/Dockerfile_omamori
@@ -39,7 +39,7 @@ FROM debian:12.12-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed0
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
-    apt-get install -y openssl libsqlite3-0 && \
+    apt-get install -y curl openssl libsqlite3-0 && \
     apt-get clean autoclean &&\
     apt-get autoremove --yes
 
diff --git a/dockerfiles/Dockerfile_ryokan b/dockerfiles/Dockerfile_ryokan
@@ -40,6 +40,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openssl \
+                       curl \
                        libsqlite3-0 \
                        wireguard-tools \
                        iptables-persistent \
diff --git a/dockerfiles/Dockerfile_sakura b/dockerfiles/Dockerfile_sakura
@@ -40,6 +40,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openssl \
+                       curl \
                        libsqlite3-0 \
                        wireguard-tools \
                        iptables-persistent \
diff --git a/dockerfiles/Dockerfile_torii b/dockerfiles/Dockerfile_torii
@@ -39,7 +39,7 @@ FROM debian:12.12-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed0
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
-    apt-get install -y openssl libsqlite3-0 && \
+    apt-get install -y curl openssl libsqlite3-0 && \
     apt-get clean autoclean &&\
     apt-get autoremove --yes
 

Original file line number	Diff line number	Diff line change
`@@ -985,7 +985,7 @@ jobs:`
`985`	`985`	`sudo apt-get install -y wireguard-tools`
`986`	`986`	`pip3 install jinja2`
`987`	`987`	`cd ${GITHUB_REPOSITORY#*/}/deploy/k8s`
`988`		`- python3 wg_gen.py`
	`988`	`+ python3 wg_gen.py --namespace default`
`989`	`989`	`-`
`990`	`990`	`name: Label nodes`
`991`	`991`	`run: \|`