Skip to content

Commit fb952f7

Browse files
kitsudaikikitsudaiki
authored
Merge pull request #796 from kitsudaiki/feat/updates-for-kubernetes-setup
related issues: - #795 - #787 - #785 - #782
2 parents 49297d3 + 2960219 commit fb952f7

82 files changed

Lines changed: 1347 additions & 258 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.secrets.baseline‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
"filename": "deploy/k8s/ainari/templates/dashboard/dashboard-certificate.yaml",
148148
"hashed_secret": "387096ca171f7ddf839bfa51b70c17c1c790d2d2",
149149
"is_verified": false,
150-
"line_number": 6
150+
"line_number": 20
151151
}
152152
],
153153
"deploy/k8s/ainari/templates/dashboard/dashboard-deployment.yaml": [
@@ -156,7 +156,7 @@
156156
"filename": "deploy/k8s/ainari/templates/dashboard/dashboard-deployment.yaml",
157157
"hashed_secret": "387096ca171f7ddf839bfa51b70c17c1c790d2d2",
158158
"is_verified": false,
159-
"line_number": 65
159+
"line_number": 79
160160
}
161161
],
162162
"deploy/k8s/ainari/templates/hanami/hanami-certificate.yaml": [
@@ -165,7 +165,7 @@
165165
"filename": "deploy/k8s/ainari/templates/hanami/hanami-certificate.yaml",
166166
"hashed_secret": "a1b78300299f72872366d7a0c32a5f19512c9d32",
167167
"is_verified": false,
168-
"line_number": 6
168+
"line_number": 20
169169
}
170170
],
171171
"deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml": [
@@ -174,7 +174,7 @@
174174
"filename": "deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml",
175175
"hashed_secret": "a1b78300299f72872366d7a0c32a5f19512c9d32",
176176
"is_verified": false,
177-
"line_number": 82
177+
"line_number": 96
178178
}
179179
],
180180
"deploy/k8s/ainari/templates/internal-api-key-secret.yaml": [
@@ -183,7 +183,7 @@
183183
"filename": "deploy/k8s/ainari/templates/internal-api-key-secret.yaml",
184184
"hashed_secret": "4bd5d8c8ea23b9df9875444c45a4c044026409b6",
185185
"is_verified": false,
186-
"line_number": 7
186+
"line_number": 21
187187
}
188188
],
189189
"deploy/k8s/ainari/templates/miko/miko-certificate.yaml": [
@@ -192,7 +192,7 @@
192192
"filename": "deploy/k8s/ainari/templates/miko/miko-certificate.yaml",
193193
"hashed_secret": "298bddaea9b4590f81a8c8c5629e7a6417415c64",
194194
"is_verified": false,
195-
"line_number": 6
195+
"line_number": 20
196196
}
197197
],
198198
"deploy/k8s/ainari/templates/miko/miko-deployment.yaml": [
@@ -201,14 +201,14 @@
201201
"filename": "deploy/k8s/ainari/templates/miko/miko-deployment.yaml",
202202
"hashed_secret": "a8fd869cf678cfd350b2aa8fb2bc4e030c75e11d",
203203
"is_verified": false,
204-
"line_number": 66
204+
"line_number": 80
205205
},
206206
{
207207
"type": "Secret Keyword",
208208
"filename": "deploy/k8s/ainari/templates/miko/miko-deployment.yaml",
209209
"hashed_secret": "298bddaea9b4590f81a8c8c5629e7a6417415c64",
210210
"is_verified": false,
211-
"line_number": 72
211+
"line_number": 86
212212
}
213213
],
214214
"deploy/k8s/ainari/templates/omamori/omamori-certificate.yaml": [
@@ -217,7 +217,7 @@
217217
"filename": "deploy/k8s/ainari/templates/omamori/omamori-certificate.yaml",
218218
"hashed_secret": "b42d97659f427e4287f30f0cd8bdc2ac5d3b10b5",
219219
"is_verified": false,
220-
"line_number": 6
220+
"line_number": 20
221221
}
222222
],
223223
"deploy/k8s/ainari/templates/omamori/omamori-config.yaml": [
@@ -226,7 +226,7 @@
226226
"filename": "deploy/k8s/ainari/templates/omamori/omamori-config.yaml",
227227
"hashed_secret": "88066d49d453bb7bb3cefca34e9d5d9b08a0dca8",
228228
"is_verified": false,
229-
"line_number": 5
229+
"line_number": 19
230230
}
231231
],
232232
"deploy/k8s/ainari/templates/omamori/omamori-deployment.yaml": [
@@ -235,16 +235,16 @@
235235
"filename": "deploy/k8s/ainari/templates/omamori/omamori-deployment.yaml",
236236
"hashed_secret": "b42d97659f427e4287f30f0cd8bdc2ac5d3b10b5",
237237
"is_verified": false,
238-
"line_number": 77
238+
"line_number": 91
239239
}
240240
],
241-
"deploy/k8s/ainari/templates/onsen/onsen-deployment.yaml": [
241+
"deploy/k8s/ainari/templates/onsen/onsen-statefulset.yaml": [
242242
{
243243
"type": "Secret Keyword",
244-
"filename": "deploy/k8s/ainari/templates/onsen/onsen-deployment.yaml",
244+
"filename": "deploy/k8s/ainari/templates/onsen/onsen-statefulset.yaml",
245245
"hashed_secret": "a191d9cb43e3f682b350dcdc74b2167ff78ed3b4",
246246
"is_verified": false,
247-
"line_number": 80
247+
"line_number": 94
248248
}
249249
],
250250
"deploy/k8s/ainari/templates/ryokan/ryokan-certificate.yaml": [
@@ -253,7 +253,7 @@
253253
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-certificate.yaml",
254254
"hashed_secret": "04f5ffaec2d0437e26b1e224de6915e15247989f",
255255
"is_verified": false,
256-
"line_number": 6
256+
"line_number": 20
257257
}
258258
],
259259
"deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml": [
@@ -262,14 +262,14 @@
262262
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
263263
"hashed_secret": "04f5ffaec2d0437e26b1e224de6915e15247989f",
264264
"is_verified": false,
265-
"line_number": 94
265+
"line_number": 108
266266
},
267267
{
268268
"type": "Secret Keyword",
269269
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
270270
"hashed_secret": "8ecbfb09891f75ade7c286346fe355113e680af7",
271271
"is_verified": false,
272-
"line_number": 100
272+
"line_number": 114
273273
}
274274
],
275275
"deploy/k8s/ainari/templates/sakura/sakura-certificate.yaml": [
@@ -278,23 +278,23 @@
278278
"filename": "deploy/k8s/ainari/templates/sakura/sakura-certificate.yaml",
279279
"hashed_secret": "1db3a3e51c405b71091fd7885f714805187b5785",
280280
"is_verified": false,
281-
"line_number": 6
281+
"line_number": 20
282282
}
283283
],
284-
"deploy/k8s/ainari/templates/sakura/sakura-deployment.yaml": [
284+
"deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml": [
285285
{
286286
"type": "Secret Keyword",
287-
"filename": "deploy/k8s/ainari/templates/sakura/sakura-deployment.yaml",
287+
"filename": "deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml",
288288
"hashed_secret": "1db3a3e51c405b71091fd7885f714805187b5785",
289289
"is_verified": false,
290-
"line_number": 90
290+
"line_number": 130
291291
},
292292
{
293293
"type": "Secret Keyword",
294-
"filename": "deploy/k8s/ainari/templates/sakura/sakura-deployment.yaml",
294+
"filename": "deploy/k8s/ainari/templates/sakura/sakura-statefulset.yaml",
295295
"hashed_secret": "845e1c68668309b563d8a17950b9529de8b3616e",
296296
"is_verified": false,
297-
"line_number": 96
297+
"line_number": 136
298298
}
299299
],
300300
"deploy/k8s/ainari/templates/torii/torii-certificate.yaml": [
@@ -303,7 +303,7 @@
303303
"filename": "deploy/k8s/ainari/templates/torii/torii-certificate.yaml",
304304
"hashed_secret": "88f7f6dda5e81f2e7958ef4d21771d2c66f2351a",
305305
"is_verified": false,
306-
"line_number": 6
306+
"line_number": 20
307307
}
308308
],
309309
"deploy/k8s/ainari/templates/torii/torii-deployment.yaml": [
@@ -312,7 +312,7 @@
312312
"filename": "deploy/k8s/ainari/templates/torii/torii-deployment.yaml",
313313
"hashed_secret": "88f7f6dda5e81f2e7958ef4d21771d2c66f2351a",
314314
"is_verified": false,
315-
"line_number": 77
315+
"line_number": 91
316316
}
317317
],
318318
"deploy/k8s/wg_gen.py": [
@@ -321,21 +321,21 @@
321321
"filename": "deploy/k8s/wg_gen.py",
322322
"hashed_secret": "a191d9cb43e3f682b350dcdc74b2167ff78ed3b4",
323323
"is_verified": false,
324-
"line_number": 36
324+
"line_number": 37
325325
},
326326
{
327327
"type": "Secret Keyword",
328328
"filename": "deploy/k8s/wg_gen.py",
329329
"hashed_secret": "8ecbfb09891f75ade7c286346fe355113e680af7",
330330
"is_verified": false,
331-
"line_number": 41
331+
"line_number": 42
332332
},
333333
{
334334
"type": "Secret Keyword",
335335
"filename": "deploy/k8s/wg_gen.py",
336336
"hashed_secret": "845e1c68668309b563d8a17950b9529de8b3616e",
337337
"is_verified": false,
338-
"line_number": 42
338+
"line_number": 43
339339
}
340340
],
341341
"docs/deployer/config/omamori_config.md": [
@@ -604,5 +604,5 @@
604604
}
605605
]
606606
},
607-
"generated_at": "2025-12-20T19:40:52Z"
607+
"generated_at": "2026-01-04T15:26:24Z"
608608
}

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@
66

77
- Vagrantfile with ansible playbook to deploy multiple virtual machines with a kubernestes with fully deployed ainari-setup and sdk-api-test
88
- image pull-policy can now be changed by the helm-values
9+
- support other namespaces thand "default"
10+
- support for multiple sakura instances
911

1012
### Changed
1113

1214
- changed the image-build process for the new vagrant-test-setup
15+
- sakura and onsen are now statefulsets within the kubernetes setup
16+
17+
### Fixed
18+
19+
- fixed broken version-output of the pre-build docker images
20+
1321

1422
## v0.10.0
1523

‎deploy/k8s/ainari/templates/ainari-issuer.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: cert-manager.io/v1
216
kind: Issuer
317
metadata:

‎deploy/k8s/ainari/templates/dashboard/dashboard-certificate.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: cert-manager.io/v1
216
kind: Certificate
317
metadata:
@@ -7,4 +21,4 @@ spec:
721
issuerRef:
822
name: selfsigned-issuer
923
dnsNames:
10-
- {{ .Values.api.domain_dashboard }}
24+
- {{ .Values.dashboard.api.domain }}

‎deploy/k8s/ainari/templates/dashboard/dashboard-config.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: v1
216
metadata:
317
name: dashboard-config
418
data:
519
config.json: |+
620
{
7-
"apiUrl": "https://{{ .Values.api.domain_miko }}"
21+
"apiUrl": "https://{{ .Values.miko.api.domain }}"
822
}
923
1024
kind: ConfigMap

‎deploy/k8s/ainari/templates/dashboard/dashboard-deployment.yaml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: apps/v1
216
kind: Deployment
317
metadata:
418
name: dashboard
519
labels:
620
app: dashboard
721
spec:
8-
replicas: 1
22+
replicas: {{ .Values.dashboard.replica_count }}
923
selector:
1024
matchLabels:
1125
app: dashboard
@@ -34,8 +48,8 @@ spec:
3448
topologyKey: kubernetes.io/hostname
3549
containers:
3650
- name: dashboard
37-
image: {{ .Values.docker.registry }}/ainari_dashboard:{{ .Values.docker.tag }}
38-
imagePullPolicy: {{ .Values.docker.pull_policy }}
51+
image: {{ .Values.dashboard.docker.repository }}:{{ .Values.dashboard.docker.tag }}
52+
imagePullPolicy: {{ .Values.dashboard.docker.pull_policy }}
3953
env:
4054
- name: RUST_LOG
4155
value: "debug"

‎deploy/k8s/ainari/templates/dashboard/dashboard-ingress.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: networking.k8s.io/v1
216
kind: Ingress
317
metadata:
@@ -10,7 +24,7 @@ metadata:
1024
spec:
1125
ingressClassName: nginx
1226
rules:
13-
- host: {{ .Values.api.domain_dashboard }}
27+
- host: {{ .Values.dashboard.api.domain }}
1428
http:
1529
paths:
1630
- path: /

0 commit comments

Comments
 (0)