From 16ab52fe0844cefbd6ee2851ab0dd34a2e6e6e4c Mon Sep 17 00:00:00 2001
From: Eddie Torres <torredil@amazon.com>
Date: Thu, 12 Jan 2023 20:11:45 +0000
Subject: [PATCH] Add `helm.sh/hook: test` annotation to chart testing
 resources

Bugfix: Prevent deployment of testing resources during normal installation by adding `helm.sh/hook: test` annotation.

Signed-off-by: Eddie Torres <torredil@amazon.com>
---
 charts/aws-ebs-csi-driver/CHANGELOG.md        |  3 ++
 charts/aws-ebs-csi-driver/Chart.yaml          |  2 +-
 .../templates/tests/helm-tester.yaml          | 33 +++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md
index ad285b6cd9..c1e88bb8ef 100644
--- a/charts/aws-ebs-csi-driver/CHANGELOG.md
+++ b/charts/aws-ebs-csi-driver/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Helm chart
 
+## v2.15.1
+* Bugfix: Prevent deployment of testing resources during normal installation by adding `helm.sh/hook: test` annotation.
+
 ## v2.15.0
 * Set sensible default resource requests/limits
 * Add sensible default update strategy
diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
index 3f48cb9f3e..8e9344a20a 100644
--- a/charts/aws-ebs-csi-driver/Chart.yaml
+++ b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.14.1
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 2.15.0
+version: 2.15.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/tests/helm-tester.yaml b/charts/aws-ebs-csi-driver/templates/tests/helm-tester.yaml
index 9556788874..9f86ef6854 100644
--- a/charts/aws-ebs-csi-driver/templates/tests/helm-tester.yaml
+++ b/charts/aws-ebs-csi-driver/templates/tests/helm-tester.yaml
@@ -2,12 +2,18 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: helm-sa
+  name: ebs-csi-driver-test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: test-role
+  name: ebs-csi-driver-test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 rules:
   - apiGroups: [ "" ]
     resources:
@@ -118,14 +124,17 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: test-role-binding
+  name: ebs-csi-driver-test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 subjects:
   - kind: ServiceAccount
-    name: helm-sa
+    name: ebs-csi-driver-test
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: test-role
+  name: ebs-csi-driver-test
   apiGroup: rbac.authorization.k8s.io
 ---
 apiVersion: v1
@@ -168,17 +177,21 @@ data:
     provisioner: ebs.csi.aws.com
     volumeBindingMode: WaitForFirstConsumer
 metadata:
-  name: manifest-config
+  name: ebs-csi-driver-test
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 ---
 apiVersion: v1
 kind: Pod
 metadata:
-  name: helm-test
+  name: ebs-csi-driver-test
   annotations:
     "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 spec:
   containers:
-    - name: helm-test
+    - name: kubetest2
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220624-1a63fdd9f2-master
       command: [ "/bin/sh", "-c" ]
       args:
@@ -194,9 +207,9 @@ spec:
       volumeMounts:
       - name: config-vol
         mountPath: /etc/config
-  serviceAccountName: helm-sa
+  serviceAccountName: ebs-csi-driver-test
   volumes:
     - name: config-vol
       configMap:
-        name: manifest-config
+        name: ebs-csi-driver-test
   restartPolicy: Never