Add make cluster/helm

Signed-off-by: Connor Catlett <[email protected]>

Author: ConnorJC3

CONTRIBUTING.md

@@ -51,12 +51,16 @@ eval "$(make cluster/kubeconfig)"
 To test a change, build the driver image and then install it:
 ```bash
 make cluster/image
-# If testing a Helm-based change, you can use HELM_EXTRA_FLAGS
-# to set your new paremeters for testing, for example:
-# export HELM_EXTRA_FLAGS="--set=controller.newParameter=true"
 make cluster/install
 ```
 
+If you are testing a Helm-only change, `make cluster/helm` installs using the default (release) image:
+```bash
+# Use HELM_EXTRA_FLAGS for testing parameters, for example:
+# export HELM_EXTRA_FLAGS="--set=controller.newParameter=true"
+make cluster/helm
+```
+
 When you are finished manually testing, uninstall the driver:
 ```bash
 make cluster/uninstall

Makefile

@@ -115,6 +115,11 @@ cluster/delete: bin/kops bin/eksctl
 cluster/install: bin/helm bin/aws
 	./hack/e2e/install.sh
 
+.PHONY: cluster/helm
+cluster/helm: bin/helm bin/aws
+	HELM_USE_DEFAULT_IMAGE="true" \
+	./hack/e2e/install.sh
+
 .PHONY: cluster/uninstall
 cluster/uninstall: bin/helm bin/aws
 	./hack/e2e/uninstall.sh

docs/makefile.md

@@ -158,9 +158,20 @@ Install the EBS CSI Driver to the cluster via Helm. You must have already run `m
 #### Example: Install the EBS CSI Driver to a cluster for testing
 
 ```bash
+make cluster/image
 make cluster/install
 ```
 
+### `make cluster/install`
+
+Install the EBS CSI Driver to the cluster via Helm using the default (release) image. This is useful for testing Helm-only changes.
+
+#### Example: Install the EBS CSI Driver to a cluster for testing a Helm-only change
+
+```bash
+make cluster/helm
+```
+
 ### `make cluster/uninstall`
 
 Uninstall an installation of the EBS CSI Driver previously installed by `make cluster/install`.

hack/e2e/util.sh

@@ -27,8 +27,6 @@ function install_driver() {
     HELM_ARGS=(upgrade --install aws-ebs-csi-driver
       "${BASE_DIR}/../../charts/aws-ebs-csi-driver"
       --namespace kube-system
-      --set image.repository="${IMAGE_NAME}"
-      --set image.tag="${IMAGE_TAG}"
       --set node.enableWindows="${WINDOWS}"
       --set node.windowsHostProcess="${WINDOWS_HOSTPROCESS}"
       --set controller.k8sTagClusterId="${CLUSTER_NAME}"
@@ -39,6 +37,10 @@ function install_driver() {
     if [ -n "${HELM_VALUES_FILE:-}" ]; then
       HELM_ARGS+=(-f "${HELM_VALUES_FILE}")
     fi
+    if [ -z "${HELM_USE_DEFAULT_IMAGE+x}" ]; then
+      HELM_ARGS+=(--set image.repository="${IMAGE_NAME}")
+      HELM_ARGS+=(--set image.tag="${IMAGE_TAG}")
+    fi
     eval "EXPANDED_HELM_EXTRA_FLAGS=$HELM_EXTRA_FLAGS"
     if [[ -n "$EXPANDED_HELM_EXTRA_FLAGS" ]]; then
       HELM_ARGS+=("${EXPANDED_HELM_EXTRA_FLAGS}")