|
@ -2,6 +2,7 @@ |
|
|
{{- $fullName := include "portalmodelo.fullname" . -}} |
|
|
{{- $fullName := include "portalmodelo.fullname" . -}} |
|
|
{{- $hostName := .Values.portal.hostname -}} |
|
|
{{- $hostName := .Values.portal.hostname -}} |
|
|
{{- $hostPrefix := .Values.portal.hostprefix -}} |
|
|
{{- $hostPrefix := .Values.portal.hostprefix -}} |
|
|
|
|
|
{{- $addPrefix := .Values.portal.addprefix -}} |
|
|
{{- $zopeFolder := .Values.portal.zopefolder -}} |
|
|
{{- $zopeFolder := .Values.portal.zopefolder -}} |
|
|
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} |
|
|
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} |
|
|
apiVersion: networking.k8s.io/v1beta1 |
|
|
apiVersion: networking.k8s.io/v1beta1 |
|
@ -53,6 +54,9 @@ spec: |
|
|
- hosts: |
|
|
- hosts: |
|
|
- "{{ $hostPrefix }}.{{ $hostName }}" |
|
|
- "{{ $hostPrefix }}.{{ $hostName }}" |
|
|
- "{{ $hostName }}" |
|
|
- "{{ $hostName }}" |
|
|
|
|
|
{{- if .Values.portal.addprefix }} |
|
|
|
|
|
- "{{ $addPrefix }}.{{ $hostName }}" |
|
|
|
|
|
{{- end }} |
|
|
secretName: {{ $hostName | replace "." "-" }}-tls |
|
|
secretName: {{ $hostName | replace "." "-" }}-tls |
|
|
{{- end }} |
|
|
{{- end }} |
|
|
rules: |
|
|
rules: |
|
@ -77,4 +81,27 @@ spec: |
|
|
backend: |
|
|
backend: |
|
|
serviceName: {{ $fullName }}-plone |
|
|
serviceName: {{ $fullName }}-plone |
|
|
servicePort: 8080 |
|
|
servicePort: 8080 |
|
|
|
|
|
{{- if .Values.portal.addprefix }} |
|
|
|
|
|
- host: "{{ $addPrefix }}.{{ $hostName }}" |
|
|
|
|
|
http: |
|
|
|
|
|
paths: |
|
|
|
|
|
{{- if and (contains "alb" .Values.ingress.class) (.Values.ingress.tls.enabled) }} |
|
|
|
|
|
- path: /* |
|
|
|
|
|
backend: |
|
|
|
|
|
serviceName: ssl-redirect |
|
|
|
|
|
servicePort: use-annotation |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
{{- if contains "nginx" .Values.ingress.class }} |
|
|
|
|
|
{{- if .Values.ingress.vhostmonster }} |
|
|
|
|
|
- path: /(.*) |
|
|
|
|
|
{{- else }} |
|
|
|
|
|
- path: / |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
{{- else }} |
|
|
|
|
|
- path: /* |
|
|
|
|
|
{{- end }} |
|
|
|
|
|
backend: |
|
|
|
|
|
serviceName: {{ $fullName }}-plone |
|
|
|
|
|
servicePort: 8080 |
|
|
|
|
|
{{- end }} |
|
|
{{- end }} |
|
|
{{- end }} |
|
|