Skip to content

Commit 47dc0a9

Browse files
fix(ui): update ingress api versions in helm chart for newer k8s vers… (zalando#1575)
* fix(ui): update ingress api versions in helm chart for newer k8s versions * fix(ui): update ingress api version in plain manifest
1 parent 66620d5 commit 47dc0a9

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

charts/postgres-operator-ui/templates/ingress.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "postgres-operator-ui.fullname" . -}}
33
{{- $svcPort := .Values.service.port -}}
4-
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
4+
5+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
6+
apiVersion: networking.k8s.io/v1
7+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
58
apiVersion: networking.k8s.io/v1beta1
69
{{- else -}}
710
apiVersion: extensions/v1beta1
@@ -37,9 +40,18 @@ spec:
3740
paths:
3841
{{- range .paths }}
3942
- path: {{ . }}
43+
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
44+
pathType: ImplementationSpecific
45+
backend:
46+
service:
47+
name: {{ $fullName }}
48+
port:
49+
number: {{ $svcPort }}
50+
{{- else -}}
4051
backend:
4152
serviceName: {{ $fullName }}
4253
servicePort: {{ $svcPort }}
54+
{{- end -}}
4355
{{- end }}
4456
{{- end }}
4557
{{- end }}

ui/manifests/ingress.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "networking.k8s.io/v1beta1"
1+
apiVersion: "networking.k8s.io/v1"
22
kind: "Ingress"
33
metadata:
44
name: "postgres-operator-ui"
@@ -10,6 +10,10 @@ spec:
1010
- host: "ui.example.org"
1111
http:
1212
paths:
13-
- backend:
14-
serviceName: "postgres-operator-ui"
15-
servicePort: 80
13+
- path: /
14+
pathType: ImplementationSpecific
15+
backend:
16+
service:
17+
name: "postgres-operator-ui"
18+
port:
19+
number: 80

0 commit comments

Comments
 (0)