diff --git a/charts/listory/templates/ingress.yaml b/charts/listory/templates/ingress.yaml index 6b25cc8..8ebfa75 100644 --- a/charts/listory/templates/ingress.yaml +++ b/charts/listory/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "listory.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 @@ -16,6 +18,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if ne .Values.ingress.ingressClassName "" }} + ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} @@ -26,6 +31,19 @@ spec: secretName: {{ .secretName }} {{- end }} {{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} + rules: + - host: {{ .Values.ingress.host | quote }} + http: + paths: + - pathType: Prefix + path: / + backend: + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} +{{- else }} rules: - host: {{ .Values.ingress.host | quote }} http: @@ -35,3 +53,4 @@ spec: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} +{{- end }} diff --git a/charts/listory/values.yaml b/charts/listory/values.yaml index c1ecb57..859a15c 100644 --- a/charts/listory/values.yaml +++ b/charts/listory/values.yaml @@ -41,6 +41,7 @@ service: ingress: enabled: false host: "" + ingressClassName: "" annotations: {} # kubernetes.io/ingress.class: nginx