fix(ui): update ingress api versions in helm chart for newer k8s vers… (#1575)

* fix(ui): update ingress api versions in helm chart for newer k8s versions
* fix(ui): update ingress api version in plain manifest
This commit is contained in:
Markus Heinemann 2021-08-12 11:52:32 +02:00 committed by GitHub
parent 66620d5049
commit 47dc0a9aee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions

View File

@ -1,7 +1,10 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "postgres-operator-ui.fullname" . -}} {{- $fullName := include "postgres-operator-ui.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{- else -}}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
@ -37,9 +40,18 @@ spec:
paths: paths:
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ . }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
pathType: ImplementationSpecific
backend:
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else -}}
backend: backend:
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $svcPort }} servicePort: {{ $svcPort }}
{{- end -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View File

@ -1,4 +1,4 @@
apiVersion: "networking.k8s.io/v1beta1" apiVersion: "networking.k8s.io/v1"
kind: "Ingress" kind: "Ingress"
metadata: metadata:
name: "postgres-operator-ui" name: "postgres-operator-ui"
@ -10,6 +10,10 @@ spec:
- host: "ui.example.org" - host: "ui.example.org"
http: http:
paths: paths:
- backend: - path: /
serviceName: "postgres-operator-ui" pathType: ImplementationSpecific
servicePort: 80 backend:
service:
name: "postgres-operator-ui"
port:
number: 80