Merge branch 'master' into release-0.12

astronomer · Feb 27, 2020 · 2761d0a · 2761d0a
2 parents 7dcd009 + ff4dce4
commit 2761d0a
Showing 1 changed file with 54 additions and 8 deletions.
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -28,9 +28,6 @@ metadata:
       if ($host = '{{- include "airflow_subdomain" . }}' ) {
         rewrite ^ {{ printf "https://%s/%s/airflow"  ( include "deployments_subdomain" .) .Release.Name }} permanent;
       }
-      if ($host = '{{- include "flower_subdomain" . }}' ) {
-        rewrite ^ {{ printf "https://%s/%s/flower"  ( include "deployments_subdomain" .) .Release.Name }} permanent;
-      }
   {{- end }}
 spec:
   tls:
@@ -44,7 +41,6 @@ spec:
       hosts:
         - {{- include "deployments_subdomain" . | indent 1 }}
         - {{- include "airflow_subdomain" . | indent 1 }}
-        - {{- include "flower_subdomain" . | indent 1 }}
   rules:
     - host: {{- include "deployments_subdomain" . | indent 1 }}
       http:
@@ -53,17 +49,67 @@ spec:
             backend:
               serviceName: {{ .Release.Name }}-webserver
               servicePort: airflow-ui
-          - path: /{{ .Release.Name }}/flower
-            backend:
-              serviceName: {{ .Release.Name }}-flower
-              servicePort: flower-ui
     - host: {{- include "airflow_subdomain" . | indent 1 }}
       http:
         paths:
           - path: /
             backend:
               serviceName: {{ .Release.Name }}-webserver
               servicePort: airflow-ui
+{{- end }}
+{{- if and .Values.ingress.enabled (eq .Values.executor "CeleryExecutor") }}
+---
+kind: Ingress
+apiVersion: extensions/v1beta1
+metadata:
+  name: {{ .Release.Name }}-flower-ingress
+  labels:
+    tier: airflow
+    component: flower-ingress
+    release: {{ .Release.Name }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    heritage: {{ .Release.Service }}
+{{- with .Values.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+  annotations:
+    kubernetes.io/ingress.class: {{ .Values.ingress.class }}
+    kubernetes.io/tls-acme: {{ eq .Values.ingress.acme true | quote }}
+    nginx.ingress.kubernetes.io/custom-http-errors: "403,404,502,503"
+  {{- if .Values.ingress.auth.enabled }}
+    nginx.ingress.kubernetes.io/auth-url: https://houston.{{ .Values.ingress.baseDomain }}/v1/authorization
+    nginx.ingress.kubernetes.io/auth-signin: https://app.{{ .Values.ingress.baseDomain }}/login
+    nginx.ingress.kubernetes.io/auth-response-headers: authorization, username, email
+    nginx.ingress.kubernetes.io/proxy-cookie-path: / /{{ .Release.Name }}/
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      if ($host = '{{- include "flower_subdomain" . }}' ) {
+        rewrite ^ {{ printf "https://%s/%s/flower"  ( include "deployments_subdomain" .) .Release.Name }} permanent;
+      }
+      rewrite ^/{{ .Release.Name }}/flower/?(.*)/$ /$1 break;
+      sub_filter '="/' '="/{{ .Release.Name }}/flower/';
+      sub_filter_last_modified on;
+      sub_filter_once off;
+  {{- end }}
+spec:
+  tls:
+          {{- if .Values.ingress.acme }}
+    - secretName: {{ .Release.Name }}-airflow-tls
+          {{- else if .Values.ingress.tlsSecretName }}
+    - secretName: {{ .Values.ingress.tlsSecretName }}
+          {{ else }}
+    - secretName: ~
+            {{- end }}
+      hosts:
+        - {{- include "deployments_subdomain" . | indent 1 }}
+        - {{- include "flower_subdomain" . | indent 1 }}
+  rules:
+    - host: {{- include "deployments_subdomain" . | indent 1 }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ .Release.Name }}-flower
+              servicePort: flower-ui
     - host: {{- include "flower_subdomain" . | indent 1 }}
       http:
         paths: