Cherry-pick the PR #458 from eks charts (#1440)

* Cherry-pick the PR #458 from eks charts * bumping chart version to sync with #508 from eks-charts
aws · Apr 23, 2021 · 9ad4860 · 9ad4860
1 parent e0f5d40
commit 9ad4860
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.1.3
+version: 1.1.4
 appVersion: "v1.7.5"
 description: A Helm chart for the AWS VPC CNI
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png

diff --git a/charts/aws-vpc-cni/README.md b/charts/aws-vpc-cni/README.md
@@ -54,6 +54,7 @@ The following table lists the configurable parameters for this chart and their d
 | `nodeSelector`          | Node labels for pod assignment                          | `{}`                                |
 | `podSecurityContext`    | Pod Security Context                                    | `{}`                                |
 | `podAnnotations`        | annotations to add to each pod                          | `{}`                                |
+| `podLabels`             | Labels to add to each pod                               | `{}`                                |
 | `priorityClassName`     | Name of the priorityClass                               | `system-node-critical`              |
 | `resources`             | Resources for the pods                                  | `requests.cpu: 10m`                 |
 | `securityContext`       | Container Security context                              | `capabilities: add: - "NET_ADMIN"`  |

diff --git a/charts/aws-vpc-cni/templates/daemonset.yaml b/charts/aws-vpc-cni/templates/daemonset.yaml
@@ -14,6 +14,9 @@ spec:
 {{- else }}
       app.kubernetes.io/name: {{ include "aws-vpc-cni.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 6 }}
+      {{- end }}
 {{- end }}
   template:
     metadata:
@@ -27,6 +30,9 @@ spec:
         app.kubernetes.io/name: {{ include "aws-vpc-cni.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         k8s-app: aws-node
+        {{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 8 }}
+        {{- end }}
     spec:
       priorityClassName: "{{ .Values.priorityClassName }}"
       serviceAccountName: {{ template "aws-vpc-cni.serviceAccountName" . }}

diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml
@@ -63,6 +63,8 @@ podSecurityContext: {}
 
 podAnnotations: {}
 
+podLabels: {}
+
 securityContext:
   capabilities:
     add: