Fixing annotation bugs related to ingress changes (#110)

pegasystems · Mar 11, 2020 · d389929 · d389929
1 parent a8020fb
commit d389929
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/charts/pega/templates/_pega-k8s-ingress.tpl b/charts/pega/templates/_pega-k8s-ingress.tpl
@@ -6,16 +6,17 @@ metadata:
   name: {{ .name }}
   namespace: {{ .root.Release.Namespace }}
   annotations:
-{{- if .node.ingress.annotations }}
+{{- $ingress := .node.ingress }}
+{{- if $ingress.annotations }}
     # Custom annotations
-{{ toYaml .node.ingress.annotations | indent 4 }}
+{{ toYaml $ingress.annotations | indent 4 }}
 {{- else }}
     # Ingress class used is 'traefik'
     kubernetes.io/ingress.class: traefik
 {{- end }}
 spec:
 {{ if ( include "ingressTlsEnabled" . ) }}
-{{- if .node.ingress.tls.secretName }}
+{{- if $ingress.tls.secretName }}
 {{ include "tlssecretsnippet" . }}
 {{ end }}
 {{ end }}

diff --git a/charts/pega/templates/_pega-service.tpl b/charts/pega/templates/_pega-service.tpl
@@ -7,6 +7,7 @@ metadata:
   name: {{ .name }}
   namespace: {{ .root.Release.Namespace }}
 {{- if .node.service.annotations }}
+  annotations: 
     # Custom annotations
 {{ toYaml .node.service.annotations | indent 4 }}
 {{- else }}