Skip to content

Commit 16e81b0

Browse files
committed
fix(#784): fix too much renaming
Accidentially renamed too much from cluster to model in the helm-charts. Signed-off-by: Tobias Anker <tobias.anker@kitsunemimi.moe>
1 parent 8e7fdbf commit 16e81b0

10 files changed

Lines changed: 17 additions & 17 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ data:
3131
file_path = "/etc/ainari/hanami/hanami_db"
3232
3333
[miko]
34-
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
34+
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
3535
3636
kind: ConfigMap

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ data:
3535
3636
[endpoints.hanami]
3737
public_address = "https://{{ .Values.hanami.api.domain }}:443"
38-
internal_address = "https://hanami-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
38+
internal_address = "https://hanami-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
3939
4040
[endpoints.ryokan]
4141
public_address = "https://{{ .Values.ryokan.api.domain }}:443"
42-
internal_address = "https://ryokan-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
42+
internal_address = "https://ryokan-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
4343
4444
[endpoints.torii]
4545
public_address = "https://{{ .Values.torii.api.domain }}:443"
46-
internal_address = "https://torii-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
46+
internal_address = "https://torii-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
4747
4848
[endpoints.omamori]
4949
public_address = "https://{{ .Values.omamori.api.domain }}:443"
50-
internal_address = "https://omamori-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
50+
internal_address = "https://omamori-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
5151
5252
kind: ConfigMap

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ data:
9696
{
9797
listen 80;
9898
server_tokens off;
99-
server_name miko-tls-service.{{ .Release.Namespace }}.svc.model.local";
99+
server_name miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local";
100100
return 301 https://$host$request_uri;
101101
}
102102
103103
server
104104
{
105105
server_tokens off;
106-
server_name miko-tls-service.{{ .Release.Namespace }}.svc.model.local";
106+
server_name miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local";
107107
108108
listen 8443 ssl;
109109
listen [::]:8443 ssl;
@@ -155,7 +155,7 @@ data:
155155
156156
proxy_pass http://127.0.0.1:11417/;
157157
proxy_read_timeout 180;
158-
proxy_redirect http://127.0.0.1:11417 https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local";
158+
proxy_redirect http://127.0.0.1:11417 https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local";
159159
}
160160
}
161161
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
file_path = "/etc/ainari/omamori/omamori_db"
3232
3333
[miko]
34-
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
34+
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
3535
3636
[simple_crypto]
3737
key_b64 = "q9vN4CjOQm5wKzyzjZtS7t4oQp8oQK1JvU5xgq8vFzE="

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ data:
2626
location = "/tmp/onsen"
2727
2828
[miko]
29-
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
29+
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
3030
3131
kind: ConfigMap

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ data:
3434
file_path = "/etc/ainari/ryokan/ryokan_db"
3535
3636
[miko]
37-
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
37+
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
3838
3939
kind: ConfigMap

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data:
2424
debug = true
2525
log_path = ""
2626
skip_tls_verification = true
27-
address = "https://sakura-{{ $i }}.sakura-tls-service.{{ $root.Release.Namespace }}.svc.model.local:8443"
27+
address = "https://sakura-{{ $i }}.sakura-tls-service.{{ $root.Release.Namespace }}.svc.cluster.local:8443"
2828
2929
[processing]
3030
max_number_of_threads = {{ $root.Values.sakura.processing.max_number_of_threads }}
@@ -42,6 +42,6 @@ data:
4242
file_path = "/etc/ainari/sakura/sakura_db"
4343
4444
[miko]
45-
address = "https://miko-tls-service.{{ $root.Release.Namespace }}.svc.model.local:8443"
45+
address = "https://miko-tls-service.{{ $root.Release.Namespace }}.svc.cluster.local:8443"
4646
--- {{/* This separator is mandatory inside the loop. otherwise only one instance is created */}}
4747
{{- end }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ metadata:
1919
labels:
2020
app: sakura
2121
spec:
22-
modelIP: None
22+
clusterIP: None
2323
selector:
2424
app: sakura
2525
ports:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
file_path = "/etc/ainari/torii/torii_db"
3232
3333
[miko]
34-
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
34+
address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
3535
3636
[ports]
3737
min_port = {{ .Values.torii.port_range.start }}

deploy/k8s/wg_gen.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# CONFIG (edit as needed)
2525
# ----------------------------
2626
NAMESPACE = "default"
27-
SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.model.local:51820" # used in client Peer Endpoint
27+
SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.cluster.local:51820" # used in client Peer Endpoint
2828
NETWORK = "10.10.0."
2929
NETWORK_MASK = "/24"
3030

@@ -127,7 +127,7 @@ def main():
127127
args = parser.parse_args()
128128

129129
NAMESPACE = args.namespace
130-
SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.model.local:51820"
130+
SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.cluster.local:51820"
131131

132132
# 1) Generate server keypair
133133
print("Generating server keypair...")

0 commit comments

Comments
 (0)