This is an automated email from the ASF dual-hosted git repository.
potiuk 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 51582263e65 Unify chart k8s label & add some missing k8s labels
(#49522)
51582263e65 is described below
commit 51582263e655ace27dc9da0a79f05eacb4e14807
Author: Przemysław Mirowski <[email protected]>
AuthorDate: Tue Apr 29 18:51:37 2025 +0200
Unify chart k8s label & add some missing k8s labels (#49522)
* Unify chart k8s label
* Add missing component k8s label in some places
* Add missing tier k8s label
* Add missing component to cleanup service account
* Fix helm tests
* Remove component from fernetkey
---
chart/templates/api-server/api-server-poddisruptionbudget.yaml | 2 +-
chart/templates/cleanup/cleanup-cronjob.yaml | 2 +-
chart/templates/cleanup/cleanup-serviceaccount.yaml | 1 +
chart/templates/configmaps/extra-configmaps.yaml | 1 +
chart/templates/priorityclasses/priority-classes.yaml | 3 +++
chart/templates/scheduler/scheduler-poddisruptionbudget.yaml | 2 +-
chart/templates/secrets/elasticsearch-secret.yaml | 3 ++-
chart/templates/secrets/extra-secrets.yaml | 1 +
chart/templates/secrets/fernetkey-secret.yaml | 2 +-
chart/templates/secrets/flower-secret.yaml | 4 +++-
chart/templates/secrets/git-ssh-key-secret.yaml | 3 ++-
chart/templates/secrets/kerberos-keytab-secret.yaml | 2 +-
chart/templates/secrets/metadata-connection-secret.yaml | 2 +-
chart/templates/secrets/opensearch-secret.yaml | 3 ++-
chart/templates/secrets/pgbouncer-certificates-secret.yaml | 4 +++-
chart/templates/secrets/pgbouncer-config-secret.yaml | 2 +-
chart/templates/secrets/pgbouncer-stats-secret.yaml | 2 +-
chart/templates/secrets/redis-secrets.yaml | 2 +-
chart/templates/secrets/registry-secret.yaml | 3 ++-
chart/templates/secrets/result-backend-connection-secret.yaml | 2 +-
chart/templates/secrets/webserver-secret-key-secret.yaml | 2 +-
chart/templates/webserver/webserver-poddisruptionbudget.yaml | 2 +-
helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py | 2 +-
helm-tests/tests/helm_tests/security/test_extra_configmaps_secrets.py | 2 ++
24 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/chart/templates/api-server/api-server-poddisruptionbudget.yaml
b/chart/templates/api-server/api-server-poddisruptionbudget.yaml
index 7d0b162e41e..1d52e41b043 100644
--- a/chart/templates/api-server/api-server-poddisruptionbudget.yaml
+++ b/chart/templates/api-server/api-server-poddisruptionbudget.yaml
@@ -30,7 +30,7 @@ metadata:
tier: airflow
component: api-server
release: {{ .Release.Name }}
- chart: {{ .Chart.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 }}
diff --git a/chart/templates/cleanup/cleanup-cronjob.yaml
b/chart/templates/cleanup/cleanup-cronjob.yaml
index 1e8da267e53..39cac3f33a4 100644
--- a/chart/templates/cleanup/cleanup-cronjob.yaml
+++ b/chart/templates/cleanup/cleanup-cronjob.yaml
@@ -34,8 +34,8 @@ metadata:
labels:
tier: airflow
component: airflow-cleanup-pods
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: {{ .Release.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/cleanup/cleanup-serviceaccount.yaml
b/chart/templates/cleanup/cleanup-serviceaccount.yaml
index 0bda2992290..1371ca48af3 100644
--- a/chart/templates/cleanup/cleanup-serviceaccount.yaml
+++ b/chart/templates/cleanup/cleanup-serviceaccount.yaml
@@ -28,6 +28,7 @@ metadata:
name: {{ include "cleanup.serviceAccountName" . }}
labels:
tier: airflow
+ component: airflow-cleanup-pods
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
diff --git a/chart/templates/configmaps/extra-configmaps.yaml
b/chart/templates/configmaps/extra-configmaps.yaml
index a24a2b51485..2e025523a0b 100644
--- a/chart/templates/configmaps/extra-configmaps.yaml
+++ b/chart/templates/configmaps/extra-configmaps.yaml
@@ -28,6 +28,7 @@ kind: ConfigMap
metadata:
name: {{ tpl $configMapName $Global | quote }}
labels:
+ tier: airflow
release: {{ $Global.Release.Name }}
chart: "{{ $Global.Chart.Name }}-{{ $Global.Chart.Version }}"
heritage: {{ $Global.Release.Service }}
diff --git a/chart/templates/priorityclasses/priority-classes.yaml
b/chart/templates/priorityclasses/priority-classes.yaml
index 8e82135fb47..22153f2c520 100644
--- a/chart/templates/priorityclasses/priority-classes.yaml
+++ b/chart/templates/priorityclasses/priority-classes.yaml
@@ -28,7 +28,10 @@ kind: PriorityClass
metadata:
name: {{ $Global.Release.Name }}-{{ $e.name }}
labels:
+ tier: airflow
release: {{ $Global.Release.Name }}
+ chart: "{{ $Global.Chart.Name }}-{{ $Global.Chart.Version }}"
+ heritage: {{ $Global.Release.Service }}
preemptionPolicy: {{ default "PreemptLowerPriority" $e.preemptionPolicy }}
value: {{ $e.value | required "value is required for priority classes" }}
description: "This priority class will not cause other pods to be preempted."
diff --git a/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
b/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
index c413b099f39..4548d40a62a 100644
--- a/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
+++ b/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
@@ -30,7 +30,7 @@ metadata:
tier: airflow
component: scheduler
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- if or (.Values.labels) (.Values.scheduler.labels) }}
{{- mustMerge .Values.scheduler.labels .Values.labels | toYaml | nindent
4 }}
diff --git a/chart/templates/secrets/elasticsearch-secret.yaml
b/chart/templates/secrets/elasticsearch-secret.yaml
index aea70f7af91..7e76654c704 100644
--- a/chart/templates/secrets/elasticsearch-secret.yaml
+++ b/chart/templates/secrets/elasticsearch-secret.yaml
@@ -26,8 +26,9 @@ kind: Secret
metadata:
name: {{ include "airflow.fullname" . }}-elasticsearch
labels:
+ tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/extra-secrets.yaml
b/chart/templates/secrets/extra-secrets.yaml
index f4a010b1494..df2f4e81c0a 100644
--- a/chart/templates/secrets/extra-secrets.yaml
+++ b/chart/templates/secrets/extra-secrets.yaml
@@ -28,6 +28,7 @@ kind: Secret
metadata:
name: {{ tpl $secretName $Global | quote }}
labels:
+ tier: airflow
release: {{ $Global.Release.Name }}
chart: "{{ $Global.Chart.Name }}-{{ $Global.Chart.Version }}"
heritage: {{ $Global.Release.Service }}
diff --git a/chart/templates/secrets/fernetkey-secret.yaml
b/chart/templates/secrets/fernetkey-secret.yaml
index a917aab2d33..28c24db35a1 100644
--- a/chart/templates/secrets/fernetkey-secret.yaml
+++ b/chart/templates/secrets/fernetkey-secret.yaml
@@ -29,7 +29,7 @@ metadata:
labels:
tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/flower-secret.yaml
b/chart/templates/secrets/flower-secret.yaml
index c28fa17a7d8..8497ba22b0d 100644
--- a/chart/templates/secrets/flower-secret.yaml
+++ b/chart/templates/secrets/flower-secret.yaml
@@ -26,8 +26,10 @@ kind: Secret
metadata:
name: {{ include "airflow.fullname" . }}-flower
labels:
+ tier: airflow
+ component: flower
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/git-ssh-key-secret.yaml
b/chart/templates/secrets/git-ssh-key-secret.yaml
index 8df2077ed67..6121b9b6fc4 100644
--- a/chart/templates/secrets/git-ssh-key-secret.yaml
+++ b/chart/templates/secrets/git-ssh-key-secret.yaml
@@ -22,8 +22,9 @@ apiVersion: v1
kind: Secret
metadata:
labels:
+ tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/kerberos-keytab-secret.yaml
b/chart/templates/secrets/kerberos-keytab-secret.yaml
index 7095e5015d9..6cb90d544b9 100644
--- a/chart/templates/secrets/kerberos-keytab-secret.yaml
+++ b/chart/templates/secrets/kerberos-keytab-secret.yaml
@@ -29,7 +29,7 @@ metadata:
tier: airflow
component: webserver
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/metadata-connection-secret.yaml
b/chart/templates/secrets/metadata-connection-secret.yaml
index d304414cc18..0f3de50dade 100644
--- a/chart/templates/secrets/metadata-connection-secret.yaml
+++ b/chart/templates/secrets/metadata-connection-secret.yaml
@@ -37,7 +37,7 @@ metadata:
labels:
tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/opensearch-secret.yaml
b/chart/templates/secrets/opensearch-secret.yaml
index e0e281d6f41..4cd1ebafd02 100644
--- a/chart/templates/secrets/opensearch-secret.yaml
+++ b/chart/templates/secrets/opensearch-secret.yaml
@@ -26,8 +26,9 @@ kind: Secret
metadata:
name: {{ include "airflow.fullname" . }}-opensearch
labels:
+ tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/pgbouncer-certificates-secret.yaml
b/chart/templates/secrets/pgbouncer-certificates-secret.yaml
index 45148391d30..a3cdb131128 100644
--- a/chart/templates/secrets/pgbouncer-certificates-secret.yaml
+++ b/chart/templates/secrets/pgbouncer-certificates-secret.yaml
@@ -26,8 +26,10 @@ kind: Secret
metadata:
name: {{ template "pgbouncer_certificates_secret" . }}
labels:
+ tier: airflow
+ component: pgbouncer
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/pgbouncer-config-secret.yaml
b/chart/templates/secrets/pgbouncer-config-secret.yaml
index 7ffc97faa74..3ee6f7782ee 100644
--- a/chart/templates/secrets/pgbouncer-config-secret.yaml
+++ b/chart/templates/secrets/pgbouncer-config-secret.yaml
@@ -29,7 +29,7 @@ metadata:
tier: airflow
component: pgbouncer
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/pgbouncer-stats-secret.yaml
b/chart/templates/secrets/pgbouncer-stats-secret.yaml
index 298bc7b2b77..2eaf62c1245 100644
--- a/chart/templates/secrets/pgbouncer-stats-secret.yaml
+++ b/chart/templates/secrets/pgbouncer-stats-secret.yaml
@@ -29,7 +29,7 @@ metadata:
tier: airflow
component: pgbouncer
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/redis-secrets.yaml
b/chart/templates/secrets/redis-secrets.yaml
index 2722f3089f2..6cde3e6e53e 100644
--- a/chart/templates/secrets/redis-secrets.yaml
+++ b/chart/templates/secrets/redis-secrets.yaml
@@ -38,7 +38,7 @@ metadata:
tier: airflow
component: redis
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/registry-secret.yaml
b/chart/templates/secrets/registry-secret.yaml
index 19add845ac5..967eb90ac79 100644
--- a/chart/templates/secrets/registry-secret.yaml
+++ b/chart/templates/secrets/registry-secret.yaml
@@ -26,8 +26,9 @@ kind: Secret
metadata:
name: {{ include "airflow.fullname" . }}-registry
labels:
+ tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/result-backend-connection-secret.yaml
b/chart/templates/secrets/result-backend-connection-secret.yaml
index 5a1b3171e6e..6771de4aa41 100644
--- a/chart/templates/secrets/result-backend-connection-secret.yaml
+++ b/chart/templates/secrets/result-backend-connection-secret.yaml
@@ -37,7 +37,7 @@ metadata:
labels:
tier: airflow
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/secrets/webserver-secret-key-secret.yaml
b/chart/templates/secrets/webserver-secret-key-secret.yaml
index d7b1d5236f3..6841e71f2f3 100644
--- a/chart/templates/secrets/webserver-secret-key-secret.yaml
+++ b/chart/templates/secrets/webserver-secret-key-secret.yaml
@@ -30,7 +30,7 @@ metadata:
tier: airflow
component: webserver
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
diff --git a/chart/templates/webserver/webserver-poddisruptionbudget.yaml
b/chart/templates/webserver/webserver-poddisruptionbudget.yaml
index eaa420d21d2..fbf36d08638 100644
--- a/chart/templates/webserver/webserver-poddisruptionbudget.yaml
+++ b/chart/templates/webserver/webserver-poddisruptionbudget.yaml
@@ -30,7 +30,7 @@ metadata:
tier: airflow
component: webserver
release: {{ .Release.Name }}
- chart: {{ .Chart.Name }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- if or (.Values.labels) (.Values.webserver.labels) }}
{{- mustMerge .Values.webserver.labels .Values.labels | toYaml | nindent
4 }}
diff --git a/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
b/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
index 00ff40799e3..91829848f8e 100644
--- a/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
+++ b/helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
@@ -401,7 +401,7 @@ class TestBaseChartTest:
}
kind_names_tuples = [
- (f"{release_name}-airflow-cleanup", "ServiceAccount", None),
+ (f"{release_name}-airflow-cleanup", "ServiceAccount",
"airflow-cleanup-pods"),
(f"{release_name}-config", "ConfigMap", "config"),
(f"{release_name}-airflow-create-user-job", "ServiceAccount",
"create-user-job"),
(f"{release_name}-airflow-flower", "ServiceAccount", "flower"),
diff --git
a/helm-tests/tests/helm_tests/security/test_extra_configmaps_secrets.py
b/helm-tests/tests/helm_tests/security/test_extra_configmaps_secrets.py
index e618234cd2c..6ad318ed36f 100644
--- a/helm-tests/tests/helm_tests/security/test_extra_configmaps_secrets.py
+++ b/helm-tests/tests/helm_tests/security/test_extra_configmaps_secrets.py
@@ -147,6 +147,7 @@ class TestExtraConfigMapsSecrets:
"release": RELEASE_NAME,
"heritage": "Helm",
"chart": mock.ANY,
+ "tier": "airflow",
}
for k8s_object in k8s_objects:
assert k8s_object["metadata"]["labels"] == expected_labels
@@ -183,6 +184,7 @@ class TestExtraConfigMapsSecrets:
"release": RELEASE_NAME,
"heritage": "Helm",
"chart": mock.ANY,
+ "tier": "airflow",
}
for k8s_object in k8s_objects:
assert k8s_object["metadata"]["labels"] == {**common_labels,
**chart_labels, **local_labels}
