From 6f40a8f8247831a300bd493f8aaceb65c17685eb Mon Sep 17 00:00:00 2001
From: Eytan Hanig <eytan@eytanhanig.com>
Date: Tue, 25 May 2021 21:33:29 -0700
Subject: [PATCH 1/2] Support custom pod labels in Helm chart

---
 charts/aws-ebs-csi-driver/Chart.yaml                         | 2 +-
 charts/aws-ebs-csi-driver/templates/controller.yaml          | 3 +++
 charts/aws-ebs-csi-driver/templates/node.yaml                | 3 +++
 charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml | 3 +++
 charts/aws-ebs-csi-driver/values.yaml                        | 3 +++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
index e8c7bc6844..1901596bc0 100644
--- a/charts/aws-ebs-csi-driver/Chart.yaml
+++ b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0.0"
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 1.1.0
+version: 1.1.1
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources:
diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index cde886f318..1ba9c15cca 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -16,6 +16,9 @@ spec:
       labels:
         app: ebs-csi-controller
         {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
+        {{- if .Values.controller.podLabels }}
+        {{- toYaml .Values.controller.podlabels | nindent 8 }}
+        {{- end }}
       {{- if .Values.controller.podAnnotations }}
       annotations:
         {{- toYaml .Values.controller.podAnnotations | nindent 8 }}
diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
index 5ecb93059a..2546bf5d6a 100644
--- a/charts/aws-ebs-csi-driver/templates/node.yaml
+++ b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -15,6 +15,9 @@ spec:
       labels:
         app: ebs-csi-node
         {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
+        {{- if .Values.node.podLabels }}
+        {{- toYaml .Values.node.podlabels | nindent 8 }}
+        {{- end }}
       {{- with .Values.node.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml b/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml
index 82ada8168b..543122246e 100644
--- a/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/snapshot-controller.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: ebs-snapshot-controller
         {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }}
+        {{- if .Values.snapshotController.podLabels }}
+        {{- toYaml .Values.snapshotController.podlabels | nindent 8 }}
+        {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount.snapshot.name }}
       nodeSelector:
diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
index a6cac89fb1..fccc0fa288 100644
--- a/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/aws-ebs-csi-driver/values.yaml
@@ -30,6 +30,7 @@ sidecars:
 snapshotController:
   repository: k8s.gcr.io/sig-storage/snapshot-controller
   tag: "v3.0.3"
+  podLabels: {}
 
 proxy:
   http_proxy:
@@ -80,6 +81,7 @@ controller:
   k8sTagClusterId:
   nodeSelector: {}
   podAnnotations: {}
+  podLabels: {}
   priorityClassName:
   # AWS region to use. If not specified then the region will be looked up via the AWS EC2 metadata
   # service.
@@ -134,6 +136,7 @@ node:
   priorityClassName:
   nodeSelector: {}
   podAnnotations: {}
+  podLabels: {}
   tolerateAllTaints: false
   tolerations: []
   resources: {}

From 727532cdcb00fad66e043492e2d98d3212935b82 Mon Sep 17 00:00:00 2001
From: Eytan Hanig <eytan@eytanhanig.com>
Date: Wed, 26 May 2021 19:18:41 -0700
Subject: [PATCH 2/2] Change helm chart increment from patch to minor

---
 charts/aws-ebs-csi-driver/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
index 1901596bc0..5897f3ba77 100644
--- a/charts/aws-ebs-csi-driver/Chart.yaml
+++ b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0.0"
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 1.1.1
+version: 1.2.0
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources: