Skip to content

Commit f0cb19a

Browse files
kitsudaikikitsudaiki
authored
Merge pull request #734 from kitsudaiki/qa/rename-bento
related issue: #733
2 parents 22865a7 + 1136825 commit f0cb19a

75 files changed

Lines changed: 177 additions & 177 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.

‎.github/workflows/build_test.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ jobs:
399399
cd ${GITHUB_REPOSITORY#*/}
400400
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
401401
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
402-
chmod +x /tmp/Ainari_debug_build_result/ainari/bento
402+
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
403403
chmod +x /tmp/Ainari_debug_build_result/ainari/sakura
404404
chmod +x /tmp/Ainari_debug_build_result/ainari/torii
405405
chmod +x /tmp/Ainari_debug_build_result/ainari/omamori
@@ -408,7 +408,7 @@ jobs:
408408
sudo chmod 777 -R /etc/ainari
409409
/tmp/Ainari_debug_build_result/ainari/hanami &
410410
/tmp/Ainari_debug_build_result/ainari/miko &
411-
/tmp/Ainari_debug_build_result/ainari/bento &
411+
/tmp/Ainari_debug_build_result/ainari/ryokan &
412412
/tmp/Ainari_debug_build_result/ainari/torii &
413413
/tmp/Ainari_debug_build_result/ainari/omamori &
414414
# sleep to make sure, that hanami is started before sakura starts
@@ -489,7 +489,7 @@ jobs:
489489
cd ${GITHUB_REPOSITORY#*/}
490490
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
491491
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
492-
chmod +x /tmp/Ainari_debug_build_result/ainari/bento
492+
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
493493
chmod +x /tmp/Ainari_debug_build_result/ainari/sakura
494494
chmod +x /tmp/Ainari_debug_build_result/ainari/torii
495495
chmod +x /tmp/Ainari_debug_build_result/ainari/omamori
@@ -498,7 +498,7 @@ jobs:
498498
sudo chmod 777 -R /etc/ainari
499499
/tmp/Ainari_debug_build_result/ainari/hanami &
500500
/tmp/Ainari_debug_build_result/ainari/miko &
501-
/tmp/Ainari_debug_build_result/ainari/bento &
501+
/tmp/Ainari_debug_build_result/ainari/ryokan &
502502
/tmp/Ainari_debug_build_result/ainari/torii &
503503
/tmp/Ainari_debug_build_result/ainari/omamori &
504504
# sleep to make sure, that hanami is started before sakura starts
@@ -605,7 +605,7 @@ jobs:
605605
cd ${GITHUB_REPOSITORY#*/}
606606
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
607607
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
608-
chmod +x /tmp/Ainari_debug_build_result/ainari/bento
608+
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
609609
chmod +x /tmp/Ainari_debug_build_result/ainari/sakura
610610
chmod +x /tmp/Ainari_debug_build_result/ainari/torii
611611
chmod +x /tmp/Ainari_debug_build_result/ainari/omamori
@@ -614,7 +614,7 @@ jobs:
614614
sudo chmod 777 -R /etc/ainari
615615
/tmp/Ainari_debug_build_result/ainari/hanami &
616616
/tmp/Ainari_debug_build_result/ainari/miko &
617-
/tmp/Ainari_debug_build_result/ainari/bento &
617+
/tmp/Ainari_debug_build_result/ainari/ryokan &
618618
/tmp/Ainari_debug_build_result/ainari/torii &
619619
/tmp/Ainari_debug_build_result/ainari/omamori &
620620
# sleep to make sure, that hanami is started before sakura starts
@@ -682,8 +682,8 @@ jobs:
682682
- { component: "hanami", platform: "linux/arm64", regitry: "kitsudaiki/hanami" }
683683
- { component: "miko", platform: "linux/amd64", regitry: "kitsudaiki/miko" }
684684
- { component: "miko", platform: "linux/arm64", regitry: "kitsudaiki/miko" }
685-
- { component: "bento", platform: "linux/amd64", regitry: "kitsudaiki/bento" }
686-
- { component: "bento", platform: "linux/arm64", regitry: "kitsudaiki/bento" }
685+
- { component: "ryokan", platform: "linux/amd64", regitry: "kitsudaiki/ryokan" }
686+
- { component: "ryokan", platform: "linux/arm64", regitry: "kitsudaiki/ryokan" }
687687
- { component: "sakura", platform: "linux/amd64", regitry: "kitsudaiki/sakura" }
688688
- { component: "sakura", platform: "linux/arm64", regitry: "kitsudaiki/sakura" }
689689
- { component: "torii", platform: "linux/amd64", regitry: "kitsudaiki/torii" }
@@ -768,7 +768,7 @@ jobs:
768768
builds:
769769
- { component: "hanami", regitry: "kitsudaiki/hanami" }
770770
- { component: "miko", regitry: "kitsudaiki/miko" }
771-
- { component: "bento", regitry: "kitsudaiki/bento" }
771+
- { component: "ryokan", regitry: "kitsudaiki/ryokan" }
772772
- { component: "sakura", regitry: "kitsudaiki/sakura" }
773773
- { component: "torii", regitry: "kitsudaiki/torii" }
774774
- { component: "omamori", regitry: "kitsudaiki/omamori" }
@@ -990,7 +990,7 @@ jobs:
990990
run: |
991991
kubectl label nodes --all hanami-node=true
992992
kubectl label nodes --all miko-node=true
993-
kubectl label nodes --all bento-node=true
993+
kubectl label nodes --all ryokan-node=true
994994
kubectl label nodes --all sakura-node=true
995995
kubectl label nodes --all torii-node=true
996996
kubectl label nodes --all omamori-node=true
@@ -1020,8 +1020,8 @@ jobs:
10201020
echo "$ingress_ip_hanami local-hanami" | sudo tee -a /etc/hosts
10211021
ingress_ip_miko=$(kubectl get ingress miko-ingress -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
10221022
echo "$ingress_ip_miko local-miko" | sudo tee -a /etc/hosts
1023-
ingress_ip_bento=$(kubectl get ingress bento-ingress -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
1024-
echo "$ingress_ip_bento local-bento" | sudo tee -a /etc/hosts
1023+
ingress_ip_ryokan=$(kubectl get ingress ryokan-ingress -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
1024+
echo "$ingress_ip_ryokan local-ryokan" | sudo tee -a /etc/hosts
10251025
ingress_ip_torii=$(kubectl get ingress torii-ingress -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
10261026
echo "$ingress_ip_torii local-torii" | sudo tee -a /etc/hosts
10271027
ingress_ip_sakura=$(kubectl get ingress sakura-ingress -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
@@ -1048,7 +1048,7 @@ jobs:
10481048
sudo cp -r ./example_configs/ainari /etc/
10491049
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11418/address = https:\/\/local-hanami/g' /etc/ainari/hanami_testing.conf
10501050
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11417/address = https:\/\/local-miko/g' /etc/ainari/hanami_testing.conf
1051-
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11416/address = https:\/\/local-bento/g' /etc/ainari/hanami_testing.conf
1051+
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11416/address = https:\/\/local-ryokan/g' /etc/ainari/hanami_testing.conf
10521052
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11416/address = https:\/\/local-sakura/g' /etc/ainari/hanami_testing.conf
10531053
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11416/address = https:\/\/local-torii/g' /etc/ainari/hanami_testing.conf
10541054
sudo sed -i 's/address = http:\/\/127\.0\.0\.1:11416/address = https:\/\/local-omamori/g' /etc/ainari/hanami_testing.conf
@@ -1071,9 +1071,9 @@ jobs:
10711071
if: ${{ always() }}
10721072
run: kubectl logs -c miko $(kubectl get pods --no-headers -o custom-columns=":metadata.name" | grep '^miko-')
10731073
-
1074-
name: Print logs of the bento-pod to make debugging easier in case of an error
1074+
name: Print logs of the ryokan-pod to make debugging easier in case of an error
10751075
if: ${{ always() }}
1076-
run: kubectl logs -c bento $(kubectl get pods --no-headers -o custom-columns=":metadata.name" | grep '^bento-')
1076+
run: kubectl logs -c ryokan $(kubectl get pods --no-headers -o custom-columns=":metadata.name" | grep '^ryokan-')
10771077
-
10781078
name: Print logs of the sakura-pod to make debugging easier in case of an error
10791079
if: ${{ always() }}

‎.secrets.baseline‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -123,24 +123,6 @@
123123
}
124124
],
125125
"results": {
126-
"deploy/k8s/ainari/templates/bento/bento-certificate.yaml": [
127-
{
128-
"type": "Secret Keyword",
129-
"filename": "deploy/k8s/ainari/templates/bento/bento-certificate.yaml",
130-
"hashed_secret": "3c2e14e6f878aba66b58be9b734ba3d41e13d4fc",
131-
"is_verified": false,
132-
"line_number": 6
133-
}
134-
],
135-
"deploy/k8s/ainari/templates/bento/bento-deployment.yaml": [
136-
{
137-
"type": "Secret Keyword",
138-
"filename": "deploy/k8s/ainari/templates/bento/bento-deployment.yaml",
139-
"hashed_secret": "3c2e14e6f878aba66b58be9b734ba3d41e13d4fc",
140-
"is_verified": false,
141-
"line_number": 74
142-
}
143-
],
144126
"deploy/k8s/ainari/templates/hanami/hanami-certificate.yaml": [
145127
{
146128
"type": "Secret Keyword",
@@ -211,6 +193,24 @@
211193
"line_number": 72
212194
}
213195
],
196+
"deploy/k8s/ainari/templates/ryokan/ryokan-certificate.yaml": [
197+
{
198+
"type": "Secret Keyword",
199+
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-certificate.yaml",
200+
"hashed_secret": "04f5ffaec2d0437e26b1e224de6915e15247989f",
201+
"is_verified": false,
202+
"line_number": 6
203+
}
204+
],
205+
"deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml": [
206+
{
207+
"type": "Secret Keyword",
208+
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
209+
"hashed_secret": "04f5ffaec2d0437e26b1e224de6915e15247989f",
210+
"is_verified": false,
211+
"line_number": 74
212+
}
213+
],
214214
"deploy/k8s/ainari/templates/sakura/sakura-certificate.yaml": [
215215
{
216216
"type": "Secret Keyword",
@@ -256,15 +256,6 @@
256256
"line_number": 24
257257
}
258258
],
259-
"example_configs/ainari/bento.toml": [
260-
{
261-
"type": "Secret Keyword",
262-
"filename": "example_configs/ainari/bento.toml",
263-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
264-
"is_verified": false,
265-
"line_number": 19
266-
}
267-
],
268259
"example_configs/ainari/hanami.toml": [
269260
{
270261
"type": "Secret Keyword",
@@ -299,6 +290,15 @@
299290
"line_number": 19
300291
}
301292
],
293+
"example_configs/ainari/ryokan.toml": [
294+
{
295+
"type": "Secret Keyword",
296+
"filename": "example_configs/ainari/ryokan.toml",
297+
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
298+
"is_verified": false,
299+
"line_number": 19
300+
}
301+
],
302302
"example_configs/ainari/sakura.toml": [
303303
{
304304
"type": "Secret Keyword",
@@ -343,5 +343,5 @@
343343
}
344344
]
345345
},
346-
"generated_at": "2025-11-06T19:47:50Z"
346+
"generated_at": "2025-11-09T11:21:53Z"
347347
}

‎.vscode/launch.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"configurations": [
77
"Debug Build hanami",
88
"Debug Build miko",
9-
"Debug Build bento",
9+
"Debug Build ryokan",
1010
"Debug Build torii",
1111
"Debug Build omamori",
1212
"Debug Build sakura"
@@ -17,7 +17,7 @@
1717
"configurations": [
1818
"Release Build hanami",
1919
"Release Build miko",
20-
"Release Build bento",
20+
"Release Build ryokan",
2121
"Release Build torii",
2222
"Release Build omamori",
2323
"Release Build sakura"
@@ -137,14 +137,14 @@
137137
},
138138
},
139139
{
140-
"name": "Debug Build bento",
140+
"name": "Debug Build ryokan",
141141
"type": "lldb",
142142
"request": "launch",
143-
"program": "${workspaceFolder}/target/debug/bento",
143+
"program": "${workspaceFolder}/target/debug/ryokan",
144144
"args": [],
145145
"cwd": "${workspaceFolder}",
146146
"stopOnEntry": false,
147-
"preLaunchTask": "build bento debug",
147+
"preLaunchTask": "build ryokan debug",
148148
"sourceLanguages": ["rust"],
149149
"env": {
150150
// test-env-variables to initialize a basic user for testing
@@ -156,14 +156,14 @@
156156
},
157157
},
158158
{
159-
"name": "Release Build bento",
159+
"name": "Release Build ryokan",
160160
"type": "lldb",
161161
"request": "launch",
162-
"program": "${workspaceFolder}/target/release/bento",
162+
"program": "${workspaceFolder}/target/release/ryokan",
163163
"args": [],
164164
"cwd": "${workspaceFolder}",
165165
"stopOnEntry": false,
166-
"preLaunchTask": "build bento release",
166+
"preLaunchTask": "build ryokan release",
167167
"sourceLanguages": ["rust"],
168168
"env": {
169169
// test-env-variables to initialize a basic user for testing

‎.vscode/tasks.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
"problemMatcher": ["$rustc"]
4545
},
4646
{
47-
"label": "build bento debug",
47+
"label": "build ryokan debug",
4848
"type": "shell",
49-
"command": "cargo build -p bento",
49+
"command": "cargo build -p ryokan",
5050
"group": "build",
5151
"problemMatcher": ["$rustc"]
5252
},
5353
{
54-
"label": "build bento release",
54+
"label": "build ryokan release",
5555
"type": "shell",
56-
"command": "cargo build --release -p bento",
56+
"command": "cargo build --release -p ryokan",
5757
"group": "build",
5858
"problemMatcher": ["$rustc"]
5959
},

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
### Added
2121

2222
- new component "Miko" for authentication
23-
- new componentn "Bento" for storage
23+
- new componentn "Ryokan" for storage
2424
- new component "Sakura", which contains the core of the previous "Hanami"
2525
- new component "Torii" as proxy to the sakura-hosts
2626
- new component "Omamori" with a very simple AES-crypto backend to store and download secrets
27-
- use shared storage in kubernetes-setup to share files between Bento and Sakura
27+
- use shared storage in kubernetes-setup to share files between Ryokan and Sakura
2828
- the new Miko-component provides the addresses of all components
2929

3030
### Changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = [
33
"src/binaries/sakura",
44
"src/binaries/hanami",
55
"src/binaries/miko",
6-
"src/binaries/bento",
6+
"src/binaries/ryokan",
77
"src/binaries/torii",
88
"src/binaries/omamori",
99
"src/libs/rust/ainari_common",

‎Earthfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ compile-ainari:
125125
RUN mkdir /tmp/ainari/
126126
RUN cp ./target/debug/sakura /tmp/ainari/
127127
RUN cp ./target/debug/miko /tmp/ainari/
128-
RUN cp ./target/debug/bento /tmp/ainari/
128+
RUN cp ./target/debug/ryokan /tmp/ainari/
129129
RUN cp ./target/debug/hanami /tmp/ainari/
130130
RUN cp ./target/debug/torii /tmp/ainari/
131131
RUN cp ./target/debug/omamori /tmp/ainari/
@@ -165,7 +165,7 @@ generate-docs:
165165

166166
COPY +compile-ainari/ainari/sakura /tmp/sakura
167167
COPY +compile-ainari/ainari/miko /tmp/miko
168-
COPY +compile-ainari/ainari/bento /tmp/bento
168+
COPY +compile-ainari/ainari/ryokan /tmp/ryokan
169169
COPY +compile-ainari/ainari/hanami /tmp/hanami
170170
COPY +compile-ainari/ainari/torii /tmp/torii
171171
COPY +compile-ainari/ainari/omamori /tmp/omamori
@@ -195,11 +195,11 @@ generate-docs:
195195
hap run /tmp/miko && \
196196
sleep 5 && \
197197
curl 127.0.0.1:11417/openapi.json > ./open_api_docu_miko.json
198-
RUN chmod +x /tmp/bento
198+
RUN chmod +x /tmp/ryokan
199199
RUN . ainari_env/bin/activate && \
200-
hap run /tmp/bento && \
200+
hap run /tmp/ryokan && \
201201
sleep 5 && \
202-
curl 127.0.0.1:11416/openapi.json > ./open_api_docu_bento.json
202+
curl 127.0.0.1:11416/openapi.json > ./open_api_docu_ryokan.json
203203
RUN chmod +x /tmp/hanami
204204
RUN . ainari_env/bin/activate && \
205205
hap run /tmp/hanami && \
@@ -228,7 +228,7 @@ generate-docs:
228228
COPY docs docs
229229
# RUN cp ./open_api_docu_sakura.json docs/frontend/
230230
RUN cp ./open_api_docu_miko.json docs/frontend/
231-
RUN cp ./open_api_docu_bento.json docs/frontend/
231+
RUN cp ./open_api_docu_ryokan.json docs/frontend/
232232
RUN cp ./open_api_docu_hanami.json docs/frontend/
233233
RUN cp ./open_api_docu_torii.json docs/frontend/
234234
RUN cp ./open_api_docu_omamori.json docs/frontend/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ data:
2626
internal_address = "https://hanami-tls-service.default.svc.cluster.local"
2727
internal_port = 8443
2828
29-
[endpoints.bento]
30-
public_address = "https://local-bento"
29+
[endpoints.ryokan]
30+
public_address = "https://local-ryokan"
3131
public_port = 443
32-
internal_address = "https://bento-tls-service.default.svc.cluster.local"
32+
internal_address = "https://ryokan-tls-service.default.svc.cluster.local"
3333
internal_port = 8443
3434
3535
[endpoints.torii]

deploy/k8s/ainari/templates/bento/bento-certificate.yaml renamed to deploy/k8s/ainari/templates/ryokan/ryokan-certificate.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apiVersion: cert-manager.io/v1
22
kind: Certificate
33
metadata:
4-
name: bento-selfsigned-cert
4+
name: ryokan-selfsigned-cert
55
spec:
6-
secretName: bento-selfsigned-secret
6+
secretName: ryokan-selfsigned-secret
77
issuerRef:
88
name: selfsigned-issuer
99
dnsNames:
10-
- {{ .Values.api.domain_bento }}
10+
- {{ .Values.api.domain_ryokan }}
1111

0 commit comments

Comments
 (0)