Skip to content

Commit f0c7232

Browse files
authored
docs(helm): support ingress for k8s +1.19 and backward (Joxit#238)
1 parent 49fcba3 commit f0c7232

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

examples/helm/docker-registry-ui/templates/ui-ingress.yaml

+31-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{{- if .Values.ui.ingress.enabled -}}
22
{{- $fullName := include "docker-registry-ui.fullname" . -}}
3+
{{- $svcPort := .Values.ui.service.port -}}
4+
{{- if and .Values.ui.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
5+
{{- if not (hasKey .Values.ui.ingress.annotations "kubernetes.io/ingress.class") }}
6+
{{- $_ := set .Values.ui.ingress.annotations "kubernetes.io/ingress.class" .Values.ui.ingress.className}}
7+
{{- end }}
8+
{{- end }}
9+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
10+
apiVersion: networking.k8s.io/v1
11+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
12+
apiVersion: networking.k8s.io/v1beta1
13+
{{- else -}}
314
apiVersion: extensions/v1beta1
15+
{{- end }}
416
kind: Ingress
517
metadata:
618
name: {{ $fullName }}
@@ -11,6 +23,9 @@ metadata:
1123
{{- toYaml . | nindent 4 }}
1224
{{- end }}
1325
spec:
26+
{{- if and .Values.ui.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
27+
ingressClassName: {{ .Values.ui.ingress.className }}
28+
{{- end }}
1429
{{- if .Values.ui.ingress.tls }}
1530
tls:
1631
{{- range .Values.ui.ingress.tls }}
@@ -26,9 +41,21 @@ spec:
2641
- host: {{ .host | quote }}
2742
http:
2843
paths:
29-
- path: /
44+
{{- range .paths }}
45+
- path: {{ .path }}
46+
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
47+
pathType: {{ .pathType }}
48+
{{- end }}
3049
backend:
50+
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
51+
service:
52+
name: {{ $fullName }}
53+
port:
54+
number: {{ $svcPort }}
55+
{{- else }}
3156
serviceName: {{ $fullName }}
32-
servicePort: http
33-
{{- end }}
34-
{{- end }}
57+
servicePort: {{ $svcPort }}
58+
{{- end }}
59+
{{- end }}
60+
{{- end }}
61+
{{- end }}

examples/helm/docker-registry-ui/values.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@ ui:
4141

4242
ingress:
4343
enabled: false
44+
className: "nginx"
4445
annotations: {}
4546
# kubernetes.io/ingress.class: nginx
4647
# kubernetes.io/tls-acme: "true"
4748
hosts:
4849
- host: docker-registry-ui.local
50+
paths:
51+
- path: /
52+
pathType: Prefix
4953

5054
tls: []
5155
# - secretName: chart-example-tls

0 commit comments

Comments
 (0)