diff --git a/chart/templates/flower/flower-ingress.yaml b/chart/templates/flower/flower-ingress.yaml index 994f8a0ea451e..17a47a6c5185d 100644 --- a/chart/templates/flower/flower-ingress.yaml +++ b/chart/templates/flower/flower-ingress.yaml @@ -20,12 +20,7 @@ ################################# {{- if .Values.flower.enabled }} {{- if and (or .Values.ingress.flower.enabled .Values.ingress.enabled) (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor")) }} -{{- $apiIsStable := semverCompare ">= 1.19.x" (include "kubeVersion" .) -}} -{{- if $apiIsStable }} apiVersion: networking.k8s.io/v1 -{{- else }} -apiVersion: networking.k8s.io/v1beta1 -{{- end }} kind: Ingress metadata: name: {{ .Release.Name }}-flower-ingress @@ -75,21 +70,14 @@ spec: - http: paths: - backend: - {{- if $apiIsStable }} service: name: {{ $.Release.Name }}-flower port: name: flower-ui - {{- else }} - serviceName: {{ $.Release.Name }}-flower - servicePort: flower-ui - {{- end }} {{- if $.Values.ingress.flower.path }} path: {{ $.Values.ingress.flower.path }} - {{- if $apiIsStable }} pathType: {{ $.Values.ingress.flower.pathType }} {{- end }} - {{- end }} {{- $hostname := . -}} {{- if . | kindIs "string" | not }} {{- $hostname = .name -}} @@ -98,7 +86,7 @@ spec: host: {{ $hostname | quote }} {{- end }} {{- end }} - {{- if and .Values.ingress.flower.ingressClassName $apiIsStable }} + {{- if .Values.ingress.flower.ingressClassName }} ingressClassName: {{ .Values.ingress.flower.ingressClassName }} {{- end }} {{- end }} diff --git a/chart/templates/webserver/webserver-ingress.yaml b/chart/templates/webserver/webserver-ingress.yaml index e6ab4b0533045..6221708d29539 100644 --- a/chart/templates/webserver/webserver-ingress.yaml +++ b/chart/templates/webserver/webserver-ingress.yaml @@ -19,12 +19,7 @@ ## Airflow Webserver Ingress ################################# {{- if or .Values.ingress.web.enabled .Values.ingress.enabled }} -{{- $apiIsStable := semverCompare ">= 1.19.x" (include "kubeVersion" .) -}} -{{- if $apiIsStable }} apiVersion: networking.k8s.io/v1 -{{- else }} -apiVersion: networking.k8s.io/v1beta1 -{{- end }} kind: Ingress metadata: name: {{ .Release.Name }}-airflow-ingress @@ -75,51 +70,30 @@ spec: paths: {{- range $.Values.ingress.web.precedingPaths }} - path: {{ .path }} - {{- if $apiIsStable }} pathType: {{ .pathType }} - {{- end }} backend: - {{- if $apiIsStable }} service: name: {{ .serviceName }} port: name: {{ .servicePort }} - {{- else }} - serviceName: {{ .serviceName }} - servicePort: {{ .servicePort }} - {{- end }} {{- end }} - backend: - {{- if $apiIsStable }} service: name: {{ $.Release.Name }}-webserver port: name: airflow-ui - {{- else }} - serviceName: {{ $.Release.Name }}-webserver - servicePort: airflow-ui - {{- end }} {{- if $.Values.ingress.web.path }} path: {{ $.Values.ingress.web.path }} - {{- if $apiIsStable }} pathType: {{ $.Values.ingress.web.pathType }} {{- end }} - {{- end }} {{- range $.Values.ingress.web.succeedingPaths }} - path: {{ .path }} - {{- if $apiIsStable }} pathType: {{ .pathType }} - {{- end }} backend: - {{- if $apiIsStable }} service: name: {{ .serviceName }} port: name: {{ .servicePort }} - {{- else }} - serviceName: {{ .serviceName }} - servicePort: {{ .servicePort }} - {{- end }} {{- end }} {{- $hostname := . -}} {{- if . | kindIs "string" | not }} @@ -129,7 +103,7 @@ spec: host: {{ $hostname | quote }} {{- end }} {{- end }} - {{- if and .Values.ingress.web.ingressClassName $apiIsStable }} + {{- if .Values.ingress.web.ingressClassName }} ingressClassName: {{ .Values.ingress.web.ingressClassName }} {{- end }} {{- end }}