Merge pull request hashicorp#479 from hashicorp/helm3-acceptance-tests

Use helm v3 in acceptance tests

.circleci/config.yml

@@ -18,7 +18,8 @@ jobs:
   acceptance:
     docker:
       # This image is build from test/docker/Test.dockerfile
-      - image: hashicorpdev/consul-helm-test:0.3.0
+      # version 0.4.0 uses helm v3 as default
+      - image: hashicorpdev/consul-helm-test:0.4.0
 
     steps:
       - checkout

test/acceptance/_helpers.bash

@@ -14,14 +14,14 @@ helm_install() {
     fi
 
     helm install -f ${values} \
-        --name consul \
+        consul \
         --wait \
         ${BATS_TEST_DIRNAME}/../..
 }
 
 # helm_delete deletes the Consul chart and all resources.
 helm_delete() {
-    helm delete --purge consul
+    helm delete consul
     kubectl delete --all pvc
 }
 

test/docker/Test.dockerfile

@@ -6,11 +6,11 @@
 # a script to configure kubectl, potentially install Helm, and run the tests
 # manually. This image only has the dependencies pre-installed.
 
-FROM alpine:latest
+FROM alpine:3.11
 WORKDIR /root
 
 ENV BATS_VERSION "1.1.0"
-ENV TERRAFORM_VERSION "0.12.10"
+ENV TERRAFORM_VERSION "0.12.26"
 
 # base packages
 RUN apk update && apk add --no-cache --virtual .build-deps \
@@ -43,7 +43,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s
     mv ./kubectl /usr/local/bin/kubectl
 
 # helm
-RUN curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
+RUN curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
 # bats
 RUN curl -sSL https://github.com/bats-core/bats-core/archive/v${BATS_VERSION}.tar.gz -o /tmp/bats.tgz \

test/terraform/main.tf

@@ -42,30 +42,14 @@ resource "null_resource" "kubectl" {
   # want this to continue on failure. Generally, this works just fine since
   # it only operates on local data.
   provisioner "local-exec" {
-    when       = "destroy"
-    on_failure = "continue"
+    when       = destroy
+    on_failure = continue
     command    = "kubectl config get-clusters | grep ${google_container_cluster.cluster.name} | xargs -n1 kubectl config delete-cluster"
   }
 
   provisioner "local-exec" {
-    when       = "destroy"
-    on_failure = "continue"
+    when       = destroy
+    on_failure = continue
     command    = "kubectl config get-contexts | grep ${google_container_cluster.cluster.name} | xargs -n1 kubectl config delete-context"
   }
 }
-
-resource "null_resource" "helm" {
-  count = var.init_cli ? 1 : 0
-  depends_on = ["null_resource.kubectl"]
-
-  triggers = {
-    cluster = google_container_cluster.cluster.id
-  }
-
-  provisioner "local-exec" {
-    command = <<EOF
-kubectl apply -f '${local.service_account_path}'
-helm init --service-account helm --wait
-EOF
-  }
-}

test/terraform/variables.tf

@@ -12,6 +12,6 @@ variable "zone" {
 }
 
 variable "init_cli" {
-  default = false
-  description = "Whether to init the CLI tools kubectl, helm, etc. or not."
+  default     = false
+  description = "Whether to init kubectl."
 }