Address Helm label review feedback

Author: mihirduvedi

chart/docs/customizing-labels.rst

@@ -32,15 +32,19 @@ Resources managed directly by the Airflow chart include the following Kubernetes
 .. code-block:: yaml
 
    app.kubernetes.io/part-of: airflow
+   app.kubernetes.io/name: airflow
    app.kubernetes.io/instance: <Helm release name>
+   app.kubernetes.io/version: <Airflow application version>
    helm.sh/chart: <chart name>-<chart version>
    app.kubernetes.io/managed-by: <Helm release service>
 
 Resources with a component label also include ``app.kubernetes.io/component`` with the same value. Pod templates include
-``app.kubernetes.io/part-of``, ``app.kubernetes.io/instance``, and ``app.kubernetes.io/component``.
+``app.kubernetes.io/part-of``, ``app.kubernetes.io/name``, ``app.kubernetes.io/instance``,
+``app.kubernetes.io/version``, and ``app.kubernetes.io/component``.
 
-The chart retains its legacy ``tier``, ``component``, ``release``, ``chart``, and ``heritage`` labels for backwards
-compatibility. Existing workload and service selectors continue to use the legacy labels.
+The chart's workload, service, policy, and autoscaling selectors use ``app.kubernetes.io/part-of``,
+``app.kubernetes.io/instance``, and ``app.kubernetes.io/component`` instead of the legacy ``tier``, ``release``, and
+``component`` labels removed in chart 2.0.
 
 Global Labels
 ~~~~~~~~~~~~~

chart/docs/customizing-workers.rst

@@ -61,12 +61,11 @@ As an example, let's say you want to set ``priorityClassName`` on your workers:
      metadata:
        name: placeholder-name
        labels:
+         app.kubernetes.io/name: airflow
          app.kubernetes.io/part-of: airflow
          app.kubernetes.io/component: worker
          app.kubernetes.io/instance: {{ .Release.Name }}
-         tier: airflow
-         component: worker
-         release: {{ .Release.Name }}
+         app.kubernetes.io/version: {{ .Chart.AppVersion }}
      spec:
        priorityClassName: high-priority
        containers:

chart/files/pod-template-file.kubernetes-helm-yaml

@@ -36,9 +36,6 @@ kind: Pod
 metadata:
   name: placeholder-name
   labels:
-    tier: airflow
-    component: worker
-    release: {{ .Release.Name }}
     {{- include "airflow.standardPodLabels" (dict "root" . "component" "worker") | nindent 4 }}
     {{- if or .Values.labels .Values.workers.kubernetes.labels }}
       {{- mustMerge .Values.workers.kubernetes.labels .Values.labels | toYaml | nindent 4 }}

chart/newsfragments/71987.feature.rst

@@ -52,7 +52,9 @@ Kubernetes recommended labels for chart resources.
   {{- $labels := dict
     "app.kubernetes.io/instance" (include "airflow.labelValue" $root.Release.Name)
     "app.kubernetes.io/managed-by" (include "airflow.labelValue" $root.Release.Service)
+    "app.kubernetes.io/name" (include "airflow.labelValue" $root.Chart.Name)
     "app.kubernetes.io/part-of" "airflow"
+    "app.kubernetes.io/version" (include "airflow.labelValue" $root.Chart.AppVersion)
     "helm.sh/chart" (include "airflow.labelValue" (printf "%s-%s" $root.Chart.Name $root.Chart.Version))
   -}}
   {{- with .component }}
@@ -69,7 +71,9 @@ Kubernetes recommended labels for chart-managed pods.
   {{- $labels := dict
     "app.kubernetes.io/component" (include "airflow.labelValue" (required "component is required for standard pod labels" .component))
     "app.kubernetes.io/instance" (include "airflow.labelValue" $root.Release.Name)
+    "app.kubernetes.io/name" (include "airflow.labelValue" $root.Chart.Name)
     "app.kubernetes.io/part-of" "airflow"
+    "app.kubernetes.io/version" (include "airflow.labelValue" $root.Chart.AppVersion)
   -}}
   {{- toYaml $labels -}}
 {{- end }}

chart/templates/_helpers.yaml

@@ -35,11 +35,6 @@ kind: Deployment
 metadata:
   name: {{ include "airflow.fullname" . }}-api-server
   labels:
-    tier: airflow
-    component: api-server
-    release: {{ .Release.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
     {{- include "airflow.standardLabels" (dict "root" . "component" "api-server") | nindent 4 }}
     {{- with .Values.labels }}
       {{- toYaml . | nindent 4 }}
@@ -72,15 +67,12 @@ spec:
     {{- end }}
   selector:
     matchLabels:
-      tier: airflow
-      component: api-server
-      release: {{ .Release.Name }}
+      app.kubernetes.io/part-of: airflow
+      app.kubernetes.io/component: api-server
+      app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        tier: airflow
-        component: api-server
-        release: {{ .Release.Name }}
         {{- include "airflow.standardPodLabels" (dict "root" . "component" "api-server") | nindent 8 }}
         {{- if or .Values.labels .Values.apiServer.labels }}
           {{- mustMerge .Values.apiServer.labels .Values.labels | toYaml | nindent 8 }}
@@ -125,7 +117,7 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  component: api-server
+                  app.kubernetes.io/component: api-server
               topologyKey: kubernetes.io/hostname
             weight: 100
         {{- end }}

chart/templates/api-server/api-server-deployment.yaml

@@ -26,11 +26,6 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "airflow.fullname" . }}-api-server
   labels:
-    tier: airflow
-    component: api-server-horizontalpodautoscaler
-    release: {{ .Release.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
     {{- include "airflow.standardLabels" (dict "root" . "component" "api-server-horizontalpodautoscaler") | nindent 4 }}
     deploymentName: {{ .Release.Name }}-api-server
     {{- if or .Values.labels .Values.apiServer.labels }}

chart/templates/api-server/api-server-hpa.yaml

@@ -36,11 +36,6 @@ kind: HTTPRoute
 metadata:
   name: {{ $fullname }}-api-server-httproute
   labels:
-    tier: airflow
-    component: airflow-api-server-httproute
-    release: {{ .Release.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
     {{- include "airflow.standardLabels" (dict "root" . "component" "airflow-api-server-httproute") | nindent 4 }}
     {{- if or .Values.labels .Values.apiServer.labels .Values.apiServer.httpRoute.labels }}
       {{- mustMerge .Values.apiServer.httpRoute.labels .Values.apiServer.labels .Values.labels | toYaml | nindent 4 }}

chart/templates/api-server/api-server-httproute.yaml

@@ -30,11 +30,6 @@ kind: Ingress
 metadata:
   name: {{ $fullname }}-ingress
   labels:
-    tier: airflow
-    component: airflow-ingress
-    release: {{ .Release.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
     {{- include "airflow.standardLabels" (dict "root" . "component" "airflow-ingress") | nindent 4 }}
     {{- if or .Values.labels .Values.apiServer.labels }}
       {{- mustMerge .Values.apiServer.labels .Values.labels | toYaml | nindent 4 }}

chart/templates/api-server/api-server-ingress.yaml

@@ -26,21 +26,16 @@ kind: NetworkPolicy
 metadata:
   name: {{ include "airflow.fullname" . }}-api-server-policy
   labels:
-    tier: airflow
-    component: airflow-api-server-policy
-    release: {{ .Release.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service }}
     {{- include "airflow.standardLabels" (dict "root" . "component" "airflow-api-server-policy") | nindent 4 }}
     {{- if or .Values.labels .Values.apiServer.labels }}
       {{- mustMerge .Values.apiServer.labels .Values.labels | toYaml | nindent 4 }}
     {{- end }}
 spec:
   podSelector:
     matchLabels:
-      tier: airflow
-      component: api-server
-      release: {{ .Release.Name }}
+      app.kubernetes.io/part-of: airflow
+      app.kubernetes.io/component: api-server
+      app.kubernetes.io/instance: {{ .Release.Name }}
   policyTypes:
     - Ingress
   {{- if .Values.apiServer.networkPolicy.ingress.from }}