add ingress hostname definition without protocol for ingress spec

Signed-off-by: Michael Valdron <[email protected]>
devfile · Mar 5, 2024 · aafd64e · aafd64e
1 parent 3a4532b
commit aafd64e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/deploy/chart/devfile-registry/templates/_template.tpl b/deploy/chart/devfile-registry/templates/_template.tpl
@@ -17,6 +17,11 @@
 {{- .Values.hostnameOverride | default (printf "devfile-registry-%s" .Release.Namespace) -}}
 {{- end -}}
 
+{{- define "devfileregistry.ingressHostname" -}}
+{{- $hostname := .Values.hostnameOverride | default (printf "devfile-registry-%s" .Release.Namespace) -}}
+{{- .Values.global.ingress.domain | printf "%s.%s" $hostname -}}
+{{- end -}}
+
 {{- define "devfileregistry.ingressUrl" -}}
 {{- $hostname := .Values.hostnameOverride | default (printf "devfile-registry-%s" .Release.Namespace) -}}
 {{- if .Values.global.tlsEnabled -}}

diff --git a/deploy/chart/devfile-registry/templates/ingress.yaml b/deploy/chart/devfile-registry/templates/ingress.yaml
@@ -26,7 +26,7 @@ metadata:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class }}
 spec:
   rules:
-  - host: {{ template "devfileregistry.ingressUrl" . }}
+  - host: {{ template "devfileregistry.ingressHostname" . }}
     http:
       paths:
       - path: /
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ metadata: @@
         kubernetes.io/ingress.class: {{ .Values.global.ingress.class }}
     spec:
       rules:
-      - host: {{ template "devfileregistry.ingressUrl" . }}
+      - host: {{ template "devfileregistry.ingressHostname" . }}
         http:
           paths:
           - path: /
@@ Expand Down @@