Double-check https ingress trailing dash

Dash on end was breaking manifest, tested with helm template
cloudera · May 6, 2021 · d9fa32f · d9fa32f
1 parent 9b98a35
commit d9fa32f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/tools/kubernetes/helm/hue/templates/ingress-https-v1.yaml b/tools/kubernetes/helm/hue/templates/ingress-https-v1.yaml
@@ -13,11 +13,11 @@ metadata:
     nginx.ingress.kubernetes.io/session-cookie-name: "hue-balancer"
     nginx.ingress.kubernetes.io/session-cookie-expires: "172800"
     nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
-    {{- if .Values.ingress.hasAuth -}}
+    {{- if .Values.ingress.hasAuth }}
     nginx.ingress.kubernetes.io/auth-type: basic
     nginx.ingress.kubernetes.io/auth-secret: basic-auth-hue
     nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
-    {{- end -}}
+    {{- end }}
 {{- with .Values.ingress.annotations }}
 {{ toYaml . | indent 4 }}
 {{- end }}
@@ -26,15 +26,15 @@ spec:
   - host: {{ .Values.ingress.domain }}
     http:
       paths:
-      {{ if .Values.websocket.enabled }}
+      {{- if .Values.websocket.enabled }}
       - backend:
           service:
             name: daphne-websocket
             port:
               number: 8001
         pathType: ImplementationSpecific
         path: /(ws/.*)
-      {{- end -}}
+      {{- end }}
       - backend:
           service:
             name: hue-balancer
@@ -69,11 +69,11 @@ spec:
   tls:
   - hosts:
     - {{ .Values.ingress.domain }}
-    {{- range .Values.ingress.extraHosts -}}
+    {{- range .Values.ingress.extraHosts }}
     - {{ . | quote }}
-    {{- end -}}
-    {{- if .Values.api.enabled -}}
+    {{- end }}
+    {{- if .Values.api.enabled }}
     - {{ .Values.api.domain }}
-    {{- end -}}
+    {{- end }}
     secretName: letsencrypt-hue-prod-tls
 {{- end -}}
diff --git a/tools/kubernetes/helm/hue/templates/ingress-https-v1beta.yaml b/tools/kubernetes/helm/hue/templates/ingress-https-v1beta.yaml
@@ -13,11 +13,11 @@ metadata:
     nginx.ingress.kubernetes.io/session-cookie-name: "hue-balancer"
     nginx.ingress.kubernetes.io/session-cookie-expires: "172800"
     nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
-    {{- if .Values.ingress.hasAuth -}}
+    {{- if .Values.ingress.hasAuth }}
     nginx.ingress.kubernetes.io/auth-type: basic
     nginx.ingress.kubernetes.io/auth-secret: basic-auth-hue
     nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
-    {{- end -}}
+    {{- end }}
 {{- with .Values.ingress.annotations }}
 {{ toYaml . | indent 4 }}
 {{- end }}
@@ -26,12 +26,12 @@ spec:
   - host: {{ .Values.ingress.domain }}
     http:
       paths:
-      {{ if .Values.websocket.enabled }}
+      {{- if .Values.websocket.enabled }}
       - backend:
           serviceName: daphne-websocket
           servicePort: 8001
         path: /(ws/.*)
-      {{- end -}}
+      {{- end }}
       - backend:
           serviceName: hue-balancer
           servicePort: 80
@@ -45,23 +45,23 @@ spec:
           servicePort: 80
         path: /
   {{- end }}
-  {{ if .Values.api.enabled }}
+  {{- if .Values.api.enabled }}
   - host: {{ .Values.api.domain }}
     http:
       paths:
       - backend:
           serviceName: hue-api
           servicePort: 8005
         path: /
-  {{ end }}
+  {{- end }}
   tls:
   - hosts:
     - {{ .Values.ingress.domain }}
-    {{- range .Values.ingress.extraHosts -}}
+    {{- range .Values.ingress.extraHosts }}
     - {{ . | quote }}
-    {{- end -}}
-    {{- if .Values.api.enabled -}}
+    {{- end }}
+    {{- if .Values.api.enabled }}
     - {{ .Values.api.domain }}
-    {{- end -}}
+    {{- end }}
     secretName: letsencrypt-hue-prod-tls
 {{- end -}}