From 9297603cea18efb1d386cfff62a58bfb5ace8ceb Mon Sep 17 00:00:00 2001
From: Eddie Torres <torredil@amazon.com>
Date: Thu, 12 Jan 2023 16:09:08 +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 +-
 .../aws-ebs-csi-driver/templates/tests/helm-tester.yaml   | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md
index ad285b6cd..c1e88bb8e 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 3f48cb9f3..8e9344a20 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 955678887..1612ead95 100644
--- a/charts/aws-ebs-csi-driver/templates/tests/helm-tester.yaml
+++ b/charts/aws-ebs-csi-driver/templates/tests/helm-tester.yaml
@@ -3,11 +3,15 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: helm-sa
+  annotations:
+    "helm.sh/hook": test
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: test-role
+  annotations:
+    "helm.sh/hook": test
 rules:
   - apiGroups: [ "" ]
     resources:
@@ -119,6 +123,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: test-role-binding
+  annotations:
+    "helm.sh/hook": test
 subjects:
   - kind: ServiceAccount
     name: helm-sa
@@ -169,6 +175,8 @@ data:
     volumeBindingMode: WaitForFirstConsumer
 metadata:
   name: manifest-config
+  annotations:
+    "helm.sh/hook": test
 ---
 apiVersion: v1
 kind: Pod