Install helm3

kubernetes-sigs · Aug 4, 2020 · fde9108 · fde9108
1 parent aa554f7
commit fde9108
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/tester/multi-az-config.yaml b/tester/multi-az-config.yaml
@@ -71,21 +71,12 @@ build: |
 install: |
   echo "Deploying driver"
   # install helm
-  OS_ARCH=$(go env GOOS)-amd64
-  helm_name=helm-v2.14.1-$OS_ARCH.tar.gz
-  wget https://get.helm.sh/$helm_name
-  tar xvzf $helm_name
-  mv $OS_ARCH/helm /usr/local/bin/helm
+  make bin/helm
 
   AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
   IMAGE_TAG={{TEST_ID}}
   IMAGE_NAME=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/aws-ebs-csi-driver
 
-  # install tiller
-  kubectl apply -f ./hack/utils/tiller-rbac.yaml 
-  helm init --service-account tiller --history-max 200 --wait
-  kubectl get po -n kube-system
-
   helm install --name aws-ebs-csi-driver \
       --set enableVolumeScheduling=true \
       --set enableVolumeResizing=true \
@@ -94,6 +85,8 @@ install: |
       --set image.tag=$IMAGE_TAG \
       ./aws-ebs-csi-driver
 
+  kubectl get po -n kube-system
+
 uninstall: | 
   echo "Removing driver"
   helm del --purge aws-ebs-csi-driver

diff --git a/tester/single-az-config.yaml b/tester/single-az-config.yaml
@@ -71,21 +71,12 @@ build: |
 install: |
   echo "Deploying driver"
   # install helm
-  OS_ARCH=$(go env GOOS)-amd64
-  helm_name=helm-v2.14.1-$OS_ARCH.tar.gz
-  wget https://get.helm.sh/$helm_name
-  tar xvzf $helm_name
-  mv $OS_ARCH/helm /usr/local/bin/helm
+  make bin/helm
 
   AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
   IMAGE_TAG={{TEST_ID}}
   IMAGE_NAME=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/aws-ebs-csi-driver
 
-  # install tiller
-  kubectl apply -f ./hack/utils/tiller-rbac.yaml 
-  helm init --service-account tiller --history-max 200 --wait
-  kubectl get po -n kube-system
-
   # install snapshot CRD
   kubectl apply -f deploy/kubernetes/cluster/
 
@@ -97,6 +88,8 @@ install: |
       --set image.tag=$IMAGE_TAG \
       ./aws-ebs-csi-driver
 
+  kubectl get po -n kube-system
+
 uninstall: | 
   echo "Removing driver"
   helm del --purge aws-ebs-csi-driver