diff --git a/contrib/charts/espresso/templates/ingress.yaml b/contrib/charts/espresso/templates/ingress.yaml index 492bcdaadcfad44cd08ceb93ac74ace774f8f4c3..a698c226fa7e5730d5618ffa54a31be7118b26ba 100644 --- a/contrib/charts/espresso/templates/ingress.yaml +++ b/contrib/charts/espresso/templates/ingress.yaml @@ -1,11 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "chart.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} @@ -16,6 +12,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.ingressClassName }} + ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} @@ -34,8 +33,10 @@ spec: {{- range .paths }} - path: {{ . }} backend: - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} {{- end }} {{- end }} {{- end }}