This is an automated email from the ASF dual-hosted git repository.
jedcunningham pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 8acfe8d Chart: Add custom labels for ingresses/PVCs (#20535)
8acfe8d is described below
commit 8acfe8d82197448d2117beab29e688a68cec156a
Author: Aakcht <[email protected]>
AuthorDate: Tue Dec 28 20:22:20 2021 +0300
Chart: Add custom labels for ingresses/PVCs (#20535)
---
chart/templates/dags-persistent-volume-claim.yaml | 3 +++
chart/templates/flower/flower-ingress.yaml | 3 +++
chart/templates/logs-persistent-volume-claim.yaml | 3 +++
chart/templates/webserver/webserver-ingress.yaml | 3 +++
chart/tests/test_basic_helm_chart.py | 9 +++++++++
5 files changed, 21 insertions(+)
diff --git a/chart/templates/dags-persistent-volume-claim.yaml
b/chart/templates/dags-persistent-volume-claim.yaml
index e237b7d..0514416 100644
--- a/chart/templates/dags-persistent-volume-claim.yaml
+++ b/chart/templates/dags-persistent-volume-claim.yaml
@@ -26,6 +26,9 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
+ {{- with .Values.labels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
accessModes: [{{ .Values.dags.persistence.accessMode | quote }}]
resources:
diff --git a/chart/templates/flower/flower-ingress.yaml
b/chart/templates/flower/flower-ingress.yaml
index efd022b..9b0407a 100644
--- a/chart/templates/flower/flower-ingress.yaml
+++ b/chart/templates/flower/flower-ingress.yaml
@@ -35,6 +35,9 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
+ {{- with .Values.labels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
{{- with .Values.ingress.flower.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/logs-persistent-volume-claim.yaml
b/chart/templates/logs-persistent-volume-claim.yaml
index 4367353..deeaa2e 100644
--- a/chart/templates/logs-persistent-volume-claim.yaml
+++ b/chart/templates/logs-persistent-volume-claim.yaml
@@ -26,6 +26,9 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
+ {{- with .Values.labels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
accessModes: ["ReadWriteMany"]
resources:
diff --git a/chart/templates/webserver/webserver-ingress.yaml
b/chart/templates/webserver/webserver-ingress.yaml
index cfc80d1..e4f0bd1 100644
--- a/chart/templates/webserver/webserver-ingress.yaml
+++ b/chart/templates/webserver/webserver-ingress.yaml
@@ -34,6 +34,9 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
+ {{- with .Values.labels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
{{- with .Values.ingress.web.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
diff --git a/chart/tests/test_basic_helm_chart.py
b/chart/tests/test_basic_helm_chart.py
index 0ce75c5..86a9785 100644
--- a/chart/tests/test_basic_helm_chart.py
+++ b/chart/tests/test_basic_helm_chart.py
@@ -143,8 +143,11 @@ class TestBaseChartTest(unittest.TestCase):
"executor": "CeleryExecutor",
"pgbouncer": {"enabled": True},
"redis": {"enabled": True},
+ "ingress": {"enabled": True},
"networkPolicies": {"enabled": True},
"cleanup": {"enabled": True},
+ "logs": {"persistence": {"enabled": True}},
+ "dags": {"persistence": {"enabled": True}},
"postgresql": {"enabled": False}, # We won't check the
objects created by the postgres chart
},
)
@@ -167,6 +170,7 @@ class TestBaseChartTest(unittest.TestCase):
(f"{release_name}-airflow-statsd", "ServiceAccount", "statsd"),
(f"{release_name}-airflow-webserver", "ServiceAccount",
"webserver"),
(f"{release_name}-airflow-worker", "ServiceAccount", "worker"),
+ (f"{release_name}-airflow-triggerer", "ServiceAccount",
"triggerer"),
(f"{release_name}-broker-url", "Secret", "redis"),
(f"{release_name}-cleanup", "CronJob", "airflow-cleanup-pods"),
(f"{release_name}-cleanup-role", "Role", None),
@@ -176,6 +180,7 @@ class TestBaseChartTest(unittest.TestCase):
(f"{release_name}-flower", "Deployment", "flower"),
(f"{release_name}-flower", "Service", "flower"),
(f"{release_name}-flower-policy", "NetworkPolicy",
"airflow-flower-policy"),
+ (f"{release_name}-flower-ingress", "Ingress", "flower-ingress"),
(f"{release_name}-pgbouncer", "Deployment", "pgbouncer"),
(f"{release_name}-pgbouncer", "Service", "pgbouncer"),
(f"{release_name}-pgbouncer-config", "Secret", "pgbouncer"),
@@ -199,9 +204,13 @@ class TestBaseChartTest(unittest.TestCase):
(f"{release_name}-webserver-secret-key", "Secret", "webserver"),
(f"{release_name}-webserver", "Service", "webserver"),
(f"{release_name}-webserver-policy", "NetworkPolicy",
"airflow-webserver-policy"),
+ (f"{release_name}-airflow-ingress", "Ingress", "airflow-ingress"),
(f"{release_name}-worker", "Service", "worker"),
(f"{release_name}-worker", "StatefulSet", "worker"),
(f"{release_name}-worker-policy", "NetworkPolicy",
"airflow-worker-policy"),
+ (f"{release_name}-triggerer", "Deployment", "triggerer"),
+ (f"{release_name}-logs", "PersistentVolumeClaim", "logs-pvc"),
+ (f"{release_name}-dags", "PersistentVolumeClaim", "dags-pvc"),
]
for k8s_object_name, kind, component in kind_names_tuples:
expected_labels = {
