Skip to content

Remove checks for 1.19 api checks #28461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedcunningham merged 1 commit into from
Dec 19, 2022
Merged

Remove checks for 1.19 api checks #28461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions chart/templates/flower/flower-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 -}}
Expand All @@ -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 }}
Expand Down
28 changes: 1 addition & 27 deletions chart/templates/webserver/webserver-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}