Browse Source

Fixed bug with invalid Yaml

master
Fábio Kaiser Rauber 4 years ago
parent
commit
e5720d9ab6
  1. 8
      charts/portalmodelo/v0.5.0/templates/ingress.yaml
  2. 2
      charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml

8
charts/portalmodelo/v0.5.0/templates/ingress.yaml

@ -12,19 +12,19 @@ metadata:
labels: labels:
{{- include "portalmodelo.labels" . | nindent 4 }} {{- include "portalmodelo.labels" . | nindent 4 }}
annotations: annotations:
{{- if .Values.ingress.tls -}} {{- if .Values.ingress.tls }}
cert-manager.io/cluster-issuer: "letsencrypt-prod" 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/rewrite-target: "/VirtualHostBase/https/www.{{ $hostName }}:443/portal/VirtualHostRoot/$1"
nginx.ingress.kubernetes.io/from-to-www-redirect: "true" nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
{{- end}} {{- end }}
spec: spec:
{{- if .Values.ingress.tls -}} {{- if .Values.ingress.tls }}
tls: tls:
- hosts: - hosts:
- "www.{{ $hostName }}" - "www.{{ $hostName }}"
- "{{ $hostName }}" - "{{ $hostName }}"
secretName: {{ $hostName | replace "." "-" }}-tls secretName: {{ $hostName | replace "." "-" }}-tls
{{- end -}} {{- end }}
rules: rules:
- host: "www.{{ $hostName }}" - host: "www.{{ $hostName }}"
http: http:

2
charts/portalmodelo/v0.5.0/templates/plone-deployment.yaml

@ -24,7 +24,7 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
{{- include "portalmodelo.zeoserverSelectorLabels" . | nindent 8 }} {{- include "portalmodelo.ploneSelectorLabels" . | nindent 8 }}
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:

Loading…
Cancel
Save