Skip to content

Commit d9fa32f

Browse files
gmsantosromainr
authored andcommitted
Double-check https ingress trailing dash
Dash on end was breaking manifest, tested with helm template
1 parent 9b98a35 commit d9fa32f

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

tools/kubernetes/helm/hue/templates/ingress-https-v1.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ metadata:
1313
nginx.ingress.kubernetes.io/session-cookie-name: "hue-balancer"
1414
nginx.ingress.kubernetes.io/session-cookie-expires: "172800"
1515
nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
16-
{{- if .Values.ingress.hasAuth -}}
16+
{{- if .Values.ingress.hasAuth }}
1717
nginx.ingress.kubernetes.io/auth-type: basic
1818
nginx.ingress.kubernetes.io/auth-secret: basic-auth-hue
1919
nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
20-
{{- end -}}
20+
{{- end }}
2121
{{- with .Values.ingress.annotations }}
2222
{{ toYaml . | indent 4 }}
2323
{{- end }}
@@ -26,15 +26,15 @@ spec:
2626
- host: {{ .Values.ingress.domain }}
2727
http:
2828
paths:
29-
{{ if .Values.websocket.enabled }}
29+
{{- if .Values.websocket.enabled }}
3030
- backend:
3131
service:
3232
name: daphne-websocket
3333
port:
3434
number: 8001
3535
pathType: ImplementationSpecific
3636
path: /(ws/.*)
37-
{{- end -}}
37+
{{- end }}
3838
- backend:
3939
service:
4040
name: hue-balancer
@@ -69,11 +69,11 @@ spec:
6969
tls:
7070
- hosts:
7171
- {{ .Values.ingress.domain }}
72-
{{- range .Values.ingress.extraHosts -}}
72+
{{- range .Values.ingress.extraHosts }}
7373
- {{ . | quote }}
74-
{{- end -}}
75-
{{- if .Values.api.enabled -}}
74+
{{- end }}
75+
{{- if .Values.api.enabled }}
7676
- {{ .Values.api.domain }}
77-
{{- end -}}
77+
{{- end }}
7878
secretName: letsencrypt-hue-prod-tls
7979
{{- end -}}

tools/kubernetes/helm/hue/templates/ingress-https-v1beta.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ metadata:
1313
nginx.ingress.kubernetes.io/session-cookie-name: "hue-balancer"
1414
nginx.ingress.kubernetes.io/session-cookie-expires: "172800"
1515
nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
16-
{{- if .Values.ingress.hasAuth -}}
16+
{{- if .Values.ingress.hasAuth }}
1717
nginx.ingress.kubernetes.io/auth-type: basic
1818
nginx.ingress.kubernetes.io/auth-secret: basic-auth-hue
1919
nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
20-
{{- end -}}
20+
{{- end }}
2121
{{- with .Values.ingress.annotations }}
2222
{{ toYaml . | indent 4 }}
2323
{{- end }}
@@ -26,12 +26,12 @@ spec:
2626
- host: {{ .Values.ingress.domain }}
2727
http:
2828
paths:
29-
{{ if .Values.websocket.enabled }}
29+
{{- if .Values.websocket.enabled }}
3030
- backend:
3131
serviceName: daphne-websocket
3232
servicePort: 8001
3333
path: /(ws/.*)
34-
{{- end -}}
34+
{{- end }}
3535
- backend:
3636
serviceName: hue-balancer
3737
servicePort: 80
@@ -45,23 +45,23 @@ spec:
4545
servicePort: 80
4646
path: /
4747
{{- end }}
48-
{{ if .Values.api.enabled }}
48+
{{- if .Values.api.enabled }}
4949
- host: {{ .Values.api.domain }}
5050
http:
5151
paths:
5252
- backend:
5353
serviceName: hue-api
5454
servicePort: 8005
5555
path: /
56-
{{ end }}
56+
{{- end }}
5757
tls:
5858
- hosts:
5959
- {{ .Values.ingress.domain }}
60-
{{- range .Values.ingress.extraHosts -}}
60+
{{- range .Values.ingress.extraHosts }}
6161
- {{ . | quote }}
62-
{{- end -}}
63-
{{- if .Values.api.enabled -}}
62+
{{- end }}
63+
{{- if .Values.api.enabled }}
6464
- {{ .Values.api.domain }}
65-
{{- end -}}
65+
{{- end }}
6666
secretName: letsencrypt-hue-prod-tls
6767
{{- end -}}

0 commit comments

Comments
 (0)