Skip to content

Commit 04fc08a

Browse files
committed
fix(helm): fix ingress annotations
1 parent c9c74d9 commit 04fc08a

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

helm/ggbridge/templates/proxy/ingress/ingress-tls.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ metadata:
3737
{{- include "ggbridge.proxy.labels" . | nindent 4 }}
3838
annotations: {{ include "ggbridge.proxy.tunnels.tls.ingress.annotations" . | nindent 4 }}
3939
spec:
40+
{{- if $ingress.className }}
4041
ingressClassName: {{ $ingress.className | quote }}
42+
{{- end }}
4143
rules:
4244
{{- range $ingress.listeners }}
4345
- host: {{ .hosntame }}

helm/ggbridge/templates/proxy/ingress/ingress-web.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ metadata:
1212
{{- include "ggbridge.proxy.labels" . | nindent 4 }}
1313
{{- if or .Values.commonAnnotations $ingress.annotations }}
1414
{{- $annotations := include "ggbridge.tplvalues.merge" ( dict "values" ( list $ingress.annotations .Values.commonAnnotations ) "context" . ) }}
15-
annotations: {{- include "ggbridge.tplvalues.render" ( dict "value" $ingress "context" .) | nindent 4 }}
15+
annotations: {{- include "ggbridge.tplvalues.render" ( dict "value" $annotations "context" .) | nindent 4 }}
1616
{{- end }}
1717
spec:
18+
{{- if $ingress.className }}
1819
ingressClassName: {{ $ingress.className | quote }}
20+
{{- end }}
1921
rules:
2022
{{- range $ingress.listeners }}
2123
- host: {{ .hostname }}

helm/ggbridge/templates/server/ingress.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ metadata:
3131
{{- include "ggbridge.server.labels" . | nindent 4 }}
3232
annotations: {{ include "ggbridge.server.ingress.annotations" . | nindent 4 }}
3333
spec:
34+
{{- if .Values.server.ingress.className }}
3435
ingressClassName: {{ .Values.server.ingress.className | quote }}
36+
{{- end }}
3537
rules:
3638
- host: {{ include "ggbridge.hostname" . | quote }}
3739
http:

0 commit comments

Comments
 (0)