diff --git a/helm/minio/templates/_helpers.tpl b/helm/minio/templates/_helpers.tpl index a88410ad5..5396972dc 100644 --- a/helm/minio/templates/_helpers.tpl +++ b/helm/minio/templates/_helpers.tpl @@ -70,8 +70,10 @@ Return the appropriate apiVersion for ingress. {{- define "minio.ingress.apiVersion" -}} {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "extensions/v1beta1" -}} -{{- else -}} +{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "networking.k8s.io/v1beta1" -}} +{{- else -}} +{{- print "networking.k8s.io/v1" -}} {{- end -}} {{- end -}} @@ -81,8 +83,10 @@ Return the appropriate apiVersion for console ingress. {{- define "minio.consoleIngress.apiVersion" -}} {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "extensions/v1beta1" -}} -{{- else -}} +{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "networking.k8s.io/v1beta1" -}} +{{- else -}} +{{- print "networking.k8s.io/v1" -}} {{- end -}} {{- end -}} diff --git a/helm/minio/templates/console-ingress.yaml b/helm/minio/templates/console-ingress.yaml index 3d83b1d85..2ce9a93bf 100644 --- a/helm/minio/templates/console-ingress.yaml +++ b/helm/minio/templates/console-ingress.yaml @@ -21,6 +21,9 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: +{{- if .Values.consoleIngress.ingressClassName }} + ingressClassName: {{ .Values.consoleIngress.ingressClassName }} +{{- end }} {{- if .Values.consoleIngress.tls }} tls: {{- range .Values.consoleIngress.tls }} @@ -36,9 +39,18 @@ spec: - http: paths: - path: {{ $ingressPath }} + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $servicePort }} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $servicePort }} + {{- end }} {{- if . }} host: {{ . | quote }} {{- end }} diff --git a/helm/minio/templates/ingress.yaml b/helm/minio/templates/ingress.yaml index 33226aaf2..8d9a837dc 100644 --- a/helm/minio/templates/ingress.yaml +++ b/helm/minio/templates/ingress.yaml @@ -21,6 +21,9 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: +{{- if .Values.ingress.ingressClassName }} + ingressClassName: {{ .Values.ingress.ingressClassName }} +{{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} @@ -36,9 +39,18 @@ spec: - http: paths: - path: {{ $ingressPath }} + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $servicePort }} + {{- else }} backend: serviceName: {{ $fullName }} servicePort: {{ $servicePort }} + {{- end }} {{- if . }} host: {{ . | quote }} {{- end }} diff --git a/helm/minio/values.yaml b/helm/minio/values.yaml index 10793ce6a..785f5f950 100644 --- a/helm/minio/values.yaml +++ b/helm/minio/values.yaml @@ -169,6 +169,7 @@ service: ingress: enabled: false + # ingressClassName: "" labels: {} # node-role.kubernetes.io/ingress: platform @@ -197,6 +198,7 @@ consoleService: consoleIngress: enabled: false + # ingressClassName: "" labels: {} # node-role.kubernetes.io/ingress: platform