Customize statsd dagprocessor labels

chart/docs/customizing-labels.rst

@@ -0,0 +1,59 @@
+.. 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.
+
+Customizing Labels for Pods
+---------------------------
+
+The Helm chart allows you to customize labels for your Airflow objects. You can set global labels that apply to all objects and pods defined in the chart, as well as component-specific labels for individual Airflow components.
+
+Global Labels
+~~~~~~~~~~~~~
+
+Global labels can be set using the ``labels`` parameter in your values file. These labels will be applied to all Airflow objects and pods defined in the chart:
+
+.. code-block:: yaml
+
+    labels:
+      environment: production
+
+Component-Specific Labels
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can also set specific labels for individual Airflow components, which will be merged with the global labels. Component-specific labels take precedence over global labels, allowing you to override them as needed.
+
+For example, to add specific labels to different components:
+
+.. code-block:: yaml
+
+    # Global labels applied to all pods
+    labels:
+      environment: production
+
+    # Scheduler specific labels
+    scheduler:
+      labels:
+        role: scheduler
+
+    # Worker specific labels
+    workers:
+      labels:
+        role: worker
+
+    # Webserver specific labels
+    webserver:
+      labels:
+        role: ui

chart/docs/index.rst

@@ -35,6 +35,7 @@ Helm Chart for Apache Airflow
     keda
     using-additional-containers
     customizing-workers
+    customizing-labels
     Installing from sources<installing-helm-chart-from-sources>
     Extending the Chart<extending-the-chart>
 

chart/templates/dag-processor/dag-processor-deployment.yaml

@@ -71,8 +71,8 @@ spec:
         tier: airflow
         component: dag-processor
         release: {{ .Release.Name }}
-        {{- with .Values.labels }}
-          {{- toYaml . | nindent 8 }}
+        {{- if or .Values.labels .Values.dagProcessor.labels }}
+          {{- mustMerge .Values.dagProcessor.labels .Values.labels | toYaml | nindent 8 }}
         {{- end }}
       annotations:
         checksum/metadata-secret: {{ include (print $.Template.BasePath "/secrets/metadata-connection-secret.yaml") . | sha256sum }}

chart/templates/dag-processor/dag-processor-serviceaccount.yaml

@@ -37,8 +37,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.dagProcessor.labels }}
+      {{- mustMerge .Values.dagProcessor.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
   {{- with .Values.dagProcessor.serviceAccount.annotations}}
   annotations: {{- toYaml . | nindent 4 }}

chart/templates/redis/redis-networkpolicy.yaml

@@ -31,8 +31,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.redis.labels }}
+      {{- mustMerge .Values.redis.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
 spec:
   podSelector:

chart/templates/redis/redis-service.yaml

@@ -31,8 +31,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.redis.labels }}
+      {{- mustMerge .Values.redis.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
 spec:
 {{- if eq .Values.redis.service.type "ClusterIP" }}

chart/templates/redis/redis-serviceaccount.yaml

@@ -32,8 +32,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.redis.labels }}
+      {{- mustMerge .Values.redis.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
   {{- with .Values.redis.serviceAccount.annotations }}
   annotations: {{- toYaml . | nindent 4 }}

chart/templates/redis/redis-statefulset.yaml

@@ -57,8 +57,8 @@ spec:
         tier: airflow
         component: redis
         release: {{ .Release.Name }}
-        {{- with .Values.labels }}
-          {{- toYaml . | nindent 8 }}
+        {{- if or .Values.labels .Values.redis.labels }}
+          {{- mustMerge .Values.redis.labels .Values.labels | toYaml | nindent 8 }}
         {{- end }}
       {{- if or .Values.redis.safeToEvict .Values.redis.podAnnotations }}
       annotations:

chart/templates/statsd/statsd-deployment.yaml

@@ -61,8 +61,8 @@ spec:
         tier: airflow
         component: statsd
         release: {{ .Release.Name }}
-        {{- with .Values.labels }}
-          {{- toYaml . | nindent 8 }}
+        {{- if or .Values.labels .Values.statsd.labels }}
+          {{- mustMerge .Values.statsd.labels .Values.labels | toYaml | nindent 8 }}
         {{- end }}
       {{- if or .Values.statsd.extraMappings .Values.statsd.podAnnotations }}
       annotations:

chart/templates/statsd/statsd-ingress.yaml

@@ -32,8 +32,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.statsd.labels }}
+      {{- mustMerge .Values.statsd.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
   {{- with .Values.ingress.statsd.annotations }}
   annotations: {{- toYaml . | nindent 4 }}

chart/templates/statsd/statsd-networkpolicy.yaml

@@ -31,8 +31,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.statsd.labels }}
+      {{- mustMerge .Values.statsd.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
 spec:
   podSelector:

chart/templates/statsd/statsd-service.yaml

@@ -31,8 +31,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.statsd.labels }}
+      {{- mustMerge .Values.statsd.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
   annotations:
     prometheus.io/scrape: "true"

chart/templates/statsd/statsd-serviceaccount.yaml

@@ -32,8 +32,8 @@ metadata:
     release: {{ .Release.Name }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     heritage: {{ .Release.Service }}
-    {{- with .Values.labels }}
-      {{- toYaml . | nindent 4 }}
+    {{- if or .Values.labels .Values.statsd.labels }}
+      {{- mustMerge .Values.statsd.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
   {{- with .Values.statsd.serviceAccount.annotations }}
   annotations: {{- toYaml . | nindent 4 }}

chart/values.schema.json

@@ -4192,6 +4192,14 @@
                         }
                     }
                 },
+                "labels": {
+                    "description": "Labels specific to dag processor objects and pods",
+                    "type": "object",
+                    "default": {},
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
                 "env": {
                     "description": "Add additional env vars to dag processor.",
                     "type": "array",
@@ -7317,6 +7325,14 @@
                         "--statsd.mapping-config=/etc/statsd-exporter/mappings.yml"
                     ]
                 },
+                "labels": {
+                    "description": "Labels specific to statsd objects and pods",
+                    "type": "object",
+                    "default": {},
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
                 "env": {
                     "description": "Add additional env vars to statsd container.",
                     "type": "array",
@@ -8306,6 +8322,14 @@
                         }
                     }
                 },
+                "labels": {
+                    "description": "Labels to add to the redis objects and pods.",
+                    "type": "object",
+                    "default": {},
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
                 "uid": {
                     "description": "Redis run as user parameter.",
                     "type": "integer",

chart/values.yaml

@@ -2174,6 +2174,10 @@ dagProcessor:
     securityContexts:
       container: {}
 
+  # Labels specific to dag processor objects
+  labels: {}
+
+  # Environment variables to add to dag processor container
   env: []
 
 # Flower settings
@@ -2404,6 +2408,10 @@ statsd:
   overrideMappings: []
 
   podAnnotations: {}
+
+  # Labels specific to statsd objects and pods
+  labels: {}
+  # Environment variables to add to statsd container
   env: []
 
 # PgBouncer settings
@@ -2717,6 +2725,9 @@ redis:
   # container level lifecycle hooks
   containerLifecycleHooks: {}
 
+  # Labels specific to redis objects and pods
+  labels: {}
+
   podAnnotations: {}
 # Auth secret for a private registry
 # This is used if pulling airflow images from a private registry