Merge pull request #25 from thesse1/fix-default-hostnames

Update default hostnames
SoftwareAG · Jan 19, 2024 · 017e18d · 017e18d
2 parents b36e696 + 6db8339
commit 017e18d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apigateway/helm/templates/ingress.yaml b/apigateway/helm/templates/ingress.yaml
@@ -23,7 +23,7 @@
 {{- range $name, $ing := .Values.ingresses -}}
 {{- if $ing.enabled -}}
 {{- $apigwname := (include "common.names.fullname" $ ) -}}
-{{- $defaultHost := default (printf "%s%s.%s" $apigwname $name $.Values.ingress.defaultDomain ) $ing.defaultHost -}}
+{{- $defaultHost := default (printf "%s-%s.%s" $apigwname $name $.Values.ingress.defaultDomain ) $ing.defaultHost -}}
 {{- if and $ing.className (not (semverCompare ">=1.18-0" $gitVersion)) }}
   {{- if not (hasKey $ing.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set $ing.annotations "kubernetes.io/ingress.class" .className}}

diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml
@@ -108,15 +108,15 @@ ingresses:
       nginx.ingress.kubernetes.io/affinity: "cookie"
       # nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
     hosts:
-      - host: 
+      - host:
         paths:
           - path: /
             pathType: Prefix
     tls: 
       - secretName: 
         hosts: 
   rt:
-    defaultHost: 
+    defaultHost: ""
     enabled: true
     svcName: ""
     svcPort: ""
@@ -140,7 +140,7 @@ ingresses:
     annotations: 
       nginx.ingress.kubernetes.io/affinity: "cookie"
     hosts:
-      - host: default
+      - host:
         paths:
           - path: /
             pathType: Prefix