Fix missing api server ingress

chart/templates/api-server/api-server-ingress.yaml

@@ -0,0 +1,113 @@
+{{/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/}}
+
+################################
+## Airflow API Server Ingress
+#################################
+{{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
+{{- if or .Values.ingress.apiServer.enabled .Values.ingress.enabled }}
+{{- $fullname := (include "airflow.fullname" .) }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullname }}-ingress
+  labels:
+    tier: airflow
+    component: airflow-ingress
+    release: {{ .Release.Name }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    heritage: {{ .Release.Service }}
+    {{- if or (.Values.labels) (.Values.apiServer.labels) }}
+      {{- mustMerge .Values.apiServer.labels .Values.labels | toYaml | nindent 4 }}
+    {{- end }}
+  {{- with .Values.ingress.apiServer.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.apiServer.hosts (.Values.ingress.apiServer.hosts | first | kindIs "string" | not) }}
+  {{- $anyTlsHosts := false -}}
+  {{- range .Values.ingress.apiServer.hosts }}
+  {{- if .tls }}
+  {{- if .tls.enabled }}
+  {{- $anyTlsHosts = true -}}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- if $anyTlsHosts }}
+  tls:
+  {{- range .Values.ingress.apiServer.hosts }}
+  {{- if .tls }}
+  {{- if .tls.enabled }}
+    - hosts:
+        - {{ .name | quote }}
+      secretName: {{ .tls.secretName }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- else if .Values.ingress.apiServer.tls.enabled }}
+  tls:
+    - hosts:
+        {{- .Values.ingress.apiServer.hosts | default (list .Values.ingress.apiServer.host) | toYaml | nindent 8 }}
+      secretName: {{ .Values.ingress.apiServer.tls.secretName }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.apiServer.hosts | default (list .Values.ingress.apiServer.host) }}
+    - http:
+        paths:
+          {{- range $.Values.ingress.apiServer.precedingPaths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ .serviceName }}
+                port:
+                  name: {{ .servicePort }}
+          {{- end }}
+          - backend:
+              service:
+                name: {{ $fullname }}-api-server
+                port:
+                  name: api-server
+            {{- if $.Values.ingress.apiServer.path }}
+            path: {{ $.Values.ingress.apiServer.path }}
+            pathType: {{ $.Values.ingress.apiServer.pathType }}
+            {{- end }}
+          {{- range $.Values.ingress.apiServer.succeedingPaths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ .serviceName }}
+                port:
+                  name: {{ .servicePort }}
+          {{- end }}
+      {{- $hostname := . -}}
+      {{- if . | kindIs "string" | not }}
+      {{- $hostname = .name -}}
+      {{- end }}
+      {{- if $hostname }}
+      host: {{ tpl $hostname $ | quote }}
+      {{- end }}
+    {{- end }}
+  {{- if .Values.ingress.apiServer.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.apiServer.ingressClassName }}
+  {{- end }}
+{{- end }}
+{{- end }}

chart/templates/api-server/api-server-networkpolicy.yaml

@@ -18,7 +18,7 @@
 */}}
 
 ################################
-## Airflow API server NetworkPolicy
+## Airflow API Server NetworkPolicy
 #################################
 {{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
 {{- if .Values.networkPolicies.enabled }}

chart/templates/api-server/api-server-poddisruptionbudget.yaml

@@ -18,7 +18,7 @@
 */}}
 
 ################################
-## Airflow api-server PodDisruptionBudget
+## Airflow API Server PodDisruptionBudget
 #################################
 {{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
 {{- if .Values.apiServer.podDisruptionBudget.enabled }}

chart/templates/api-server/api-server-service.yaml

@@ -18,7 +18,7 @@
 */}}
 
 ################################
-## Airflow api-server Service
+## Airflow API Server Service
 #################################
 {{- if semverCompare ">=3.0.0" .Values.airflowVersion }}
 apiVersion: v1

chart/templates/api-server/api-server-serviceaccount.yaml

@@ -18,7 +18,7 @@
 */}}
 
 ######################################
-## Airflow api-server ServiceAccount
+## Airflow API Server ServiceAccount
 ######################################
 {{- if and .Values.apiServer.serviceAccount.create (semverCompare ">=3.0.0" .Values.airflowVersion) }}
 apiVersion: v1

chart/values.yaml

@@ -138,9 +138,54 @@ labels: {}
 
 # Ingress configuration
 ingress:
-  # Enable all ingress resources (deprecated - use ingress.web.enabled and ingress.flower.enabled)
+  # Enable all ingress resources
+  # (deprecated - use ingress.web.enabled, ingress.apiServer.enabled and ingress.flower.enabled)
   enabled: ~
 
+  # Configs for the Ingress of the API Server
+  apiServer:
+    # Enable API Server ingress resource
+    enabled: false
+
+    # Annotations for the API Server Ingress
+    annotations: {}
+
+    # The path for the API Server Ingress
+    path: "/"
+
+    # The pathType for the above path (used only with Kubernetes v1.19 and above)
+    pathType: "ImplementationSpecific"
+
+    # The hostname for the API Server Ingress (Deprecated - renamed to `ingress.apiServer.hosts`)
+    host: ""
+
+    # The hostnames or hosts configuration for the API Server Ingress
+    hosts: []
+    #   # The hostname for the web Ingress (templated)
+    # - name: ""
+    #   # configs for API Server Ingress TLS
+    #   tls:
+    #     # Enable TLS termination for the API Server Ingress
+    #     enabled: false
+    #     # the name of a pre-created Secret containing a TLS private key and certificate
+    #     secretName: ""
+
+    # The Ingress Class for the API Server Ingress (used only with Kubernetes v1.19 and above)
+    ingressClassName: ""
+
+    # configs for API Server Ingress TLS (Deprecated - renamed to `ingress.apiServer.hosts[*].tls`)
+    tls:
+      # Enable TLS termination for the API Server Ingress
+      enabled: false
+      # the name of a pre-created Secret containing a TLS private key and certificate
+      secretName: ""
+
+    # HTTP paths to add to the API Server Ingress before the default path
+    precedingPaths: []
+
+    # Http paths to add to the API Server Ingress after the default path
+    succeedingPaths: []
+
   # Configs for the Ingress of the web Service
   web:
     # Enable web ingress resource