Add the ability to specify additional labels for pod and statefulset (#11206)

Signed-off-by: Matthew DeVenny <matt@boxboat.com>

stable/consul/Chart.yaml

@@ -1,6 +1,6 @@
 name: consul
 home: https://github.com/hashicorp/consul
-version: 3.6.0
+version: 3.6.1
 appVersion: 1.0.0
 description: Highly available and distributed service discovery and key-value store
   designed with support for the modern data center to make distributed systems and

stable/consul/README.md

@@ -70,6 +70,7 @@ The following table lists the configurable parameters of the consul chart and th
 | `test.imageTag`         | Test container image tag  (used for helm test)     | `v1.4.8-bash`                                 |
 | `test.rbac.create`                      | Create rbac for test container                 | `false`                           |
 | `test.rbac.serviceAccountName`          | Name of existed service account for test container    | ``                         |
+| `additionalLabels`      | Add labels to Pod and StatefulSet     | `{}`                                                       |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 

stable/consul/templates/consul-statefulset.yaml

@@ -7,6 +7,9 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "consul.chart" . }}
     component: "{{ .Release.Name }}-{{ .Values.Component }}"
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels | indent 4 }}
+{{- end }}
 spec:
   serviceName: "{{ template "consul.fullname" . }}"
   replicas: {{ default 3 .Values.Replicas }}
@@ -24,6 +27,9 @@ spec:
         release: {{ .Release.Name | quote }}
         chart: {{ template "consul.chart" . }}
         component: "{{ .Release.Name }}-{{ .Values.Component }}"
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels | indent 8 }}
+{{- end }}
     spec:
       securityContext:
         fsGroup: 1000

stable/consul/values.yaml

@@ -136,3 +136,4 @@ test:
 
 nodeSelector: {}
 tolerations: []
+additionalLabels: {}