Merge pull request kubernetes#3687 from mgarstecki/allowAdditionalLabels

Add additionalLabels chart value

Author: k8s-ci-robot

charts/cluster-autoscaler/Chart.yaml

@@ -17,4 +17,4 @@ name: cluster-autoscaler
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
-version: 9.2.0
+version: 9.3.0

charts/cluster-autoscaler/README.md

@@ -325,6 +325,7 @@ Though enough for the majority of installations, the default PodSecurityPolicy _
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| additionalLabels | object | `{}` | Labels to add to each object of the chart. |
 | affinity | object | `{}` | Affinity for pod assignment |
 | autoDiscovery.clusterName | string | `nil` | Enable autodiscovery for `cloudProvider=aws`, for groups matching `autoDiscovery.tags`. Enable autodiscovery for `cloudProvider=gce`, but no MIG tagging required. Enable autodiscovery for `cloudProvider=magnum`, for groups matching `autoDiscovery.roles`. |
 | autoDiscovery.roles | list | `["worker"]` | Magnum node group roles to match. |

charts/cluster-autoscaler/templates/_helpers.tpl

@@ -46,6 +46,9 @@ Return labels, including instance and name.
 {{ include "cluster-autoscaler.instance-name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
 helm.sh/chart: {{ include "cluster-autoscaler.chart" . | quote }}
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end -}}
 {{- end -}}
 
 {{/*

charts/cluster-autoscaler/templates/deployment.yaml

@@ -26,6 +26,9 @@ spec:
     {{- end }}
       labels:
 {{ include "cluster-autoscaler.instance-name" . | indent 8 }}
+      {{- if .Values.additionalLabels }}
+{{ toYaml .values.additionalLabels | indent 8 }}
+      {{- end }}
       {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
       {{- end }}

charts/cluster-autoscaler/values.yaml

@@ -211,6 +211,9 @@ podDisruptionBudget:
 # podLabels -- Labels to add to each pod.
 podLabels: {}
 
+# additionalLabels -- Labels to add to each object of the chart.
+additionalLabels: {}
+
 # priorityClassName -- priorityClassName
 priorityClassName: ""