diff --git a/charts/portalmodelo/v0.5.0/templates/ingress.yaml b/charts/portalmodelo/v0.5.0/templates/ingress.yaml index 6f83027..9d2f06d 100644 --- a/charts/portalmodelo/v0.5.0/templates/ingress.yaml +++ b/charts/portalmodelo/v0.5.0/templates/ingress.yaml @@ -12,19 +12,19 @@ metadata: labels: {{- include "portalmodelo.labels" . | nindent 4 }} annotations: - {{- if .Values.ingress.tls -}} + {{- if .Values.ingress.tls }} cert-manager.io/cluster-issuer: "letsencrypt-prod" nginx.ingress.kubernetes.io/rewrite-target: "/VirtualHostBase/https/www.{{ $hostName }}:443/portal/VirtualHostRoot/$1" nginx.ingress.kubernetes.io/from-to-www-redirect: "true" - {{- end}} + {{- end }} spec: - {{- if .Values.ingress.tls -}} + {{- if .Values.ingress.tls }} tls: - hosts: - "www.{{ $hostName }}" - "{{ $hostName }}" secretName: {{ $hostName | replace "." "-" }}-tls - {{- end -}} + {{- end }} rules: - host: "www.{{ $hostName }}" http: diff --git a/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml b/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml index d22d3ef..c30270e 100644 --- a/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml +++ b/charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml @@ -24,7 +24,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "portalmodelo.zeoserverSelectorLabels" . | nindent 8 }} + {{- include "portalmodelo.ploneSelectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: