fix(#784): fix too much renaming

kitsudaiki · kitsudaiki · commit 4aa7523fdd05 · 2026-01-15T21:34:12.000+01:00
Accidentially renamed too much from cluster
to model in the helm-charts.

Signed-off-by: Tobias Anker &lt;tobias.anker@kitsunemimi.moe&gt;
diff --git a/deploy/k8s/ainari/templates/dashboard/dashboard-tls-service.yaml b/deploy/k8s/ainari/templates/dashboard/dashboard-tls-service.yaml
@@ -26,4 +26,4 @@ spec:
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ModelIP
+  type: ClusterIP
diff --git a/deploy/k8s/ainari/templates/hanami/hanami-config.yaml b/deploy/k8s/ainari/templates/hanami/hanami-config.yaml
@@ -31,6 +31,6 @@ data:
     file_path = "/etc/ainari/hanami/hanami_db"
     
     [miko]
-    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
 kind: ConfigMap
diff --git a/deploy/k8s/ainari/templates/hanami/hanami-tls-service.yaml b/deploy/k8s/ainari/templates/hanami/hanami-tls-service.yaml
@@ -26,4 +26,4 @@ spec:
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ModelIP
+  type: ClusterIP
diff --git a/deploy/k8s/ainari/templates/miko/miko-config.yaml b/deploy/k8s/ainari/templates/miko/miko-config.yaml
@@ -35,18 +35,18 @@ data:
 
     [endpoints.hanami]
     public_address = "https://{{ .Values.hanami.api.domain }}:443"
-    internal_address = "https://hanami-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    internal_address = "https://hanami-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
     [endpoints.ryokan]
     public_address = "https://{{ .Values.ryokan.api.domain }}:443"
-    internal_address = "https://ryokan-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    internal_address = "https://ryokan-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
     [endpoints.torii]
     public_address = "https://{{ .Values.torii.api.domain }}:443"
-    internal_address = "https://torii-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    internal_address = "https://torii-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
     [endpoints.omamori]
     public_address = "https://{{ .Values.omamori.api.domain }}:443"
-    internal_address = "https://omamori-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    internal_address = "https://omamori-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
 kind: ConfigMap
diff --git a/deploy/k8s/ainari/templates/miko/miko-nginx-config.yaml b/deploy/k8s/ainari/templates/miko/miko-nginx-config.yaml
@@ -96,14 +96,14 @@ data:
         {
             listen 80;
             server_tokens off;
-            server_name miko-tls-service.{{ .Release.Namespace }}.svc.model.local";
+            server_name miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local";
             return 301 https://$host$request_uri;
         }
 
         server
         {
             server_tokens off;
-            server_name miko-tls-service.{{ .Release.Namespace }}.svc.model.local";
+            server_name miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local";
 
             listen 8443 ssl;
             listen [::]:8443 ssl;
@@ -155,7 +155,7 @@ data:
 
                 proxy_pass http://127.0.0.1:11417/;
                 proxy_read_timeout 180;
-                proxy_redirect http://127.0.0.1:11417 https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local";
+                proxy_redirect http://127.0.0.1:11417 https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local";
             }
         }
     }
diff --git a/deploy/k8s/ainari/templates/miko/miko-tls-service.yaml b/deploy/k8s/ainari/templates/miko/miko-tls-service.yaml
@@ -26,4 +26,4 @@ spec:
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ModelIP
+  type: ClusterIP
diff --git a/deploy/k8s/ainari/templates/omamori/omamori-config.yaml b/deploy/k8s/ainari/templates/omamori/omamori-config.yaml
@@ -31,7 +31,7 @@ data:
     file_path = "/etc/ainari/omamori/omamori_db"
     
     [miko]
-    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
     [simple_crypto]
     key_b64 = "q9vN4CjOQm5wKzyzjZtS7t4oQp8oQK1JvU5xgq8vFzE="
diff --git a/deploy/k8s/ainari/templates/omamori/omamori-tls-service.yaml b/deploy/k8s/ainari/templates/omamori/omamori-tls-service.yaml
@@ -26,4 +26,4 @@ spec:
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ModelIP
+  type: ClusterIP
diff --git a/deploy/k8s/ainari/templates/onsen/onsen-config.yaml b/deploy/k8s/ainari/templates/onsen/onsen-config.yaml
@@ -26,6 +26,6 @@ data:
     location = "/tmp/onsen"
     
     [miko]
-    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
     
 kind: ConfigMap
diff --git a/deploy/k8s/ainari/templates/ryokan/ryokan-config.yaml b/deploy/k8s/ainari/templates/ryokan/ryokan-config.yaml
@@ -34,6 +34,6 @@ data:
     file_path = "/etc/ainari/ryokan/ryokan_db"
     
     [miko]
-    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
 kind: ConfigMap
diff --git a/deploy/k8s/ainari/templates/ryokan/ryokan-tls-service.yaml b/deploy/k8s/ainari/templates/ryokan/ryokan-tls-service.yaml
@@ -26,4 +26,4 @@ spec:
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ModelIP
+  type: ClusterIP
diff --git a/deploy/k8s/ainari/templates/sakura/sakura-config.yaml b/deploy/k8s/ainari/templates/sakura/sakura-config.yaml
@@ -24,7 +24,7 @@ data:
     debug = true
     log_path = ""
     skip_tls_verification = true
-    address = "https://sakura-{{ $i }}.sakura-tls-service.{{ $root.Release.Namespace }}.svc.model.local:8443"
+    address = "https://sakura-{{ $i }}.sakura-tls-service.{{ $root.Release.Namespace }}.svc.cluster.local:8443"
 
     [processing]
     max_number_of_threads = {{ $root.Values.sakura.processing.max_number_of_threads }}
@@ -42,6 +42,6 @@ data:
     file_path = "/etc/ainari/sakura/sakura_db"
     
     [miko]
-    address = "https://miko-tls-service.{{ $root.Release.Namespace }}.svc.model.local:8443"
+    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 }}
diff --git a/deploy/k8s/ainari/templates/sakura/sakura-tls-service.yaml b/deploy/k8s/ainari/templates/sakura/sakura-tls-service.yaml
@@ -19,7 +19,7 @@ metadata:
   labels:
     app: sakura
 spec:
-  modelIP: None
+  clusterIP: None
   selector:
     app: sakura
   ports:
diff --git a/deploy/k8s/ainari/templates/torii/torii-config.yaml b/deploy/k8s/ainari/templates/torii/torii-config.yaml
@@ -31,7 +31,7 @@ data:
     file_path = "/etc/ainari/torii/torii_db"
     
     [miko]
-    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.model.local:8443"
+    address = "https://miko-tls-service.{{ .Release.Namespace }}.svc.cluster.local:8443"
 
     [ports]
     min_port = {{ .Values.torii.port_range.start }}
diff --git a/deploy/k8s/ainari/templates/torii/torii-tls-service.yaml b/deploy/k8s/ainari/templates/torii/torii-tls-service.yaml
@@ -26,4 +26,4 @@ spec:
       protocol: TCP
       port: 8443
       targetPort: 8443
-  type: ModelIP
+  type: ClusterIP
diff --git a/deploy/k8s/wg_gen.py b/deploy/k8s/wg_gen.py
@@ -24,7 +24,7 @@
 # CONFIG (edit as needed)
 # ----------------------------
 NAMESPACE = "default"
-SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.model.local:51820"  # used in client Peer Endpoint
+SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.cluster.local:51820"  # used in client Peer Endpoint
 NETWORK = "10.10.0."
 NETWORK_MASK = "/24"
 
@@ -127,7 +127,7 @@ def main():
     args = parser.parse_args()
 
     NAMESPACE = args.namespace
-    SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.model.local:51820"
+    SERVER_ENDPOINT = f"wg-onsen.{NAMESPACE}.svc.cluster.local:51820"
 
     # 1) Generate server keypair
     print("Generating server keypair...")

Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,14 @@ data:`
`96`	`96`	`{`
`97`	`97`	`listen 80;`
`98`	`98`	`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";`
`100`	`100`	`return 301 https://$host$request_uri;`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`server`
`104`	`104`	`{`
`105`	`105`	`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";`
`107`	`107`
`108`	`108`	`listen 8443 ssl;`
`109`	`109`	`listen [::]:8443 ssl;`
`@@ -155,7 +155,7 @@ data:`
`155`	`155`
`156`	`156`	`proxy_pass http://127.0.0.1:11417/;`
`157`	`157`	`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";`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`}`