maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

helm: add support for Ingress networking.k8s.io/v1 (#13350)

Browse source
This commit is contained in:
Pumba98 2021-10-03 23:51:34 +02:00 committed by GitHub
parent d6a3215fe2
commit bbbf25201a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
helm/minio/templates/_helpers.tpl
View file

@ -70,8 +70,10 @@ Return the appropriate apiVersion for ingress.
{{- define "minio.ingress.apiVersion" -}} {{- define "minio.ingress.apiVersion" -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- print "extensions/v1beta1" -}} {{- print "extensions/v1beta1" -}}
{{- else -}} {{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- print "networking.k8s.io/v1beta1" -}} {{- print "networking.k8s.io/v1beta1" -}}
{{- else -}}
{{- print "networking.k8s.io/v1" -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@ -81,8 +83,10 @@ Return the appropriate apiVersion for console ingress.
{{- define "minio.consoleIngress.apiVersion" -}} {{- define "minio.consoleIngress.apiVersion" -}}
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- print "extensions/v1beta1" -}} {{- print "extensions/v1beta1" -}}
{{- else -}} {{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- print "networking.k8s.io/v1beta1" -}} {{- print "networking.k8s.io/v1beta1" -}}
{{- else -}}
{{- print "networking.k8s.io/v1" -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

12
helm/minio/templates/console-ingress.yaml
View file

@ -21,6 +21,9 @@ metadata:
{{ toYaml . | indent 4 }} {{ toYaml . | indent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.consoleIngress.ingressClassName }}
ingressClassName: {{ .Values.consoleIngress.ingressClassName }}
{{- end }}
{{- if .Values.consoleIngress.tls }} {{- if .Values.consoleIngress.tls }}
tls: tls:
{{- range .Values.consoleIngress.tls }} {{- range .Values.consoleIngress.tls }}
@ -36,9 +39,18 @@ spec:
- http: - http:
paths: paths:
- path: {{ $ingressPath }} - path: {{ $ingressPath }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
backend:
service:
name: {{ $fullName }}
port:
number: {{ $servicePort }}
{{- else }}
backend: backend:
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $servicePort }} servicePort: {{ $servicePort }}
{{- end }}
{{- if . }} {{- if . }}
host: {{ . | quote }} host: {{ . | quote }}
{{- end }} {{- end }}

12
helm/minio/templates/ingress.yaml
View file

@ -21,6 +21,9 @@ metadata:
{{ toYaml . | indent 4 }} {{ toYaml . | indent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName }}
{{- end }}
{{- if .Values.ingress.tls }} {{- if .Values.ingress.tls }}
tls: tls:
{{- range .Values.ingress.tls }} {{- range .Values.ingress.tls }}
@ -36,9 +39,18 @@ spec:
- http: - http:
paths: paths:
- path: {{ $ingressPath }} - path: {{ $ingressPath }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
backend:
service:
name: {{ $fullName }}
port:
number: {{ $servicePort }}
{{- else }}
backend: backend:
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $servicePort }} servicePort: {{ $servicePort }}
{{- end }}
{{- if . }} {{- if . }}
host: {{ . | quote }} host: {{ . | quote }}
{{- end }} {{- end }}

2
helm/minio/values.yaml
View file

@ -169,6 +169,7 @@ service:
ingress: ingress:
enabled: false enabled: false
# ingressClassName: ""
labels: {} labels: {}
# node-role.kubernetes.io/ingress: platform # node-role.kubernetes.io/ingress: platform
@ -197,6 +198,7 @@ consoleService:
consoleIngress: consoleIngress:
enabled: false enabled: false
# ingressClassName: ""
labels: {} labels: {}
# node-role.kubernetes.io/ingress: platform # node-role.kubernetes.io/ingress: platform