Skip to content

Commit 2a1de36

Browse files
Release 1.17 (#692)
* fix flower authsidecar (#690) * PINF:46 - Add logs emptydir with releaseName (#691) * add logs with releasename * update chart --------- Co-authored-by: pgvishnuram <81585115+pgvishnuram@users.noreply.github.com>
1 parent da40b72 commit 2a1de36

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# apiVersion v2 is Helm 3
22
apiVersion: v2
33
name: airflow
4-
version: 1.17.19
4+
version: 1.17.20
55
description: Helm chart to deploy the Astronomer Platform Airflow module
66
icon: https://airflow.apache.org/docs/apache-airflow/stable/_images/pin_large.png
77
keywords:

templates/flower/flower-auth-sidecar-configmap.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,14 @@ data:
4848
return 302 https://app.{{ .Values.platform.controlPlaneBaseDomain }}/login?rd=https://$http_host$request_uri;
4949
}
5050

51-
location ~* "^/{{ .Release.Name }}/flower(/|$)(.*)" {
51+
location ~* "^/{{ .Release.Name }}/flower/" {
5252
{{ include "default_nginx_settings_location" . | indent 8 }}
5353
{{ include "default_nginx_auth_headers" . | indent 8 }}
5454

5555
if ($host = '{{ .Values.platform.release }}-flower.{{ .Values.ingress.baseDomain }}' ) {
5656
rewrite ^ https://deployments.{{ .Values.ingress.baseDomain }}/{{ .Release.Name }}/flower permanent;
5757
}
5858
proxy_cookie_path / /{{ .Release.Name }}/;
59-
sub_filter_types *;
60-
sub_filter '="/' '="/{{ .Release.Name }}/flower/';
61-
sub_filter_last_modified on;
62-
sub_filter_once off;
63-
rewrite "(?i)/{{ .Release.Name }}/flower(/|$)(.*)" /$2; break;
6459
# Custom headers to proxied server
6560
proxy_set_header Host deployments.{{ .Values.ingress.baseDomain}};
6661
#proxy_set_header X-Forwarded-Proto https;

values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ airflow:
291291
resources: {{- toYaml .Values.workers.resources | nindent 8 }}
292292
volumeMounts:
293293
- mountPath: {{ template "airflow_logs" . }}
294-
name: logs
294+
name: logs-{{ .Release.Name }}
295295
- name: config
296296
mountPath: {{ template "airflow_config_path" . }}
297297
subPath: airflow.cfg
@@ -341,12 +341,12 @@ airflow:
341341
emptyDir: {}
342342
{{- end }}
343343
{{- if .Values.logs.persistence.enabled }}
344-
- name: logs
344+
- name: logs-{{ .Release.Name }}
345345
persistentVolumeClaim:
346346
claimName: {{ template "airflow_logs_volume_claim" . }}
347347
{{- else }}
348348
- emptyDir: {}
349-
name: logs
349+
name: logs-{{ .Release.Name }}
350350
{{- end }}
351351
{{- if and .Values.dags.gitSync.enabled .Values.dags.gitSync.sshKeySecret }}
352352
{{- include "git_sync_ssh_key_volume" . | nindent 2 }}

0 commit comments

Comments
 (0)