Update kind, Helm, and Go (#206)

Signed-off-by: Reinhard Naegele <[email protected]>

Author: unguiculus

.circleci/config.yml

@@ -22,21 +22,21 @@ jobs:
           command: |
             # We need to install Golang 1.13 because the CircleCI machine image has an outdated version.
             # We need to use a CircleCI machine in order to be able to run kind.
-            curl -sSLO https://dl.google.com/go/go1.13.4.linux-amd64.tar.gz
+            curl -sSLO https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz
             sudo rm -r /usr/local/go
-            sudo tar -C /usr/local -xzf go1.13.4.linux-amd64.tar.gz
+            sudo tar -C /usr/local -xzf go1.13.8.linux-amd64.tar.gz
 
             curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
             chmod +x ./kubectl
             sudo mv ./kubectl /usr/local/bin/kubectl
 
-            helm_version=v3.0.1
+            helm_version=v3.0.3
             curl -sSLO "https://get.helm.sh/helm-$helm_version-linux-amd64.tar.gz"
             sudo mkdir -p "/usr/local/helm-$helm_version"
             sudo tar -xzf "helm-$helm_version-linux-amd64.tar.gz" -C "/usr/local/helm-$helm_version"
             sudo ln -s "/usr/local/helm-$helm_version/linux-amd64/helm" /usr/local/bin/helm
 
-            curl -sSLo kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.5.1/kind-linux-amd64"
+            curl -sSLo kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-linux-amd64"
             chmod +x kind
             sudo mv kind /usr/local/bin/kind
       - run:

e2e-kind.sh

@@ -7,13 +7,11 @@ set -o pipefail
 CLUSTER_NAME=chart-testing
 readonly CLUSTER_NAME
 
-K8S_VERSION=v1.15.3
+K8S_VERSION=v1.17.0
 readonly K8S_VERSION
 
 create_kind_cluster() {
     kind create cluster --name "$CLUSTER_NAME" --image "kindest/node:$K8S_VERSION" --wait 60s
-    KUBECONFIG="$(kind get kubeconfig-path --name="$CLUSTER_NAME")"
-    export KUBECONFIG
 
     kubectl cluster-info || kubectl cluster-info dump
     echo
@@ -25,18 +23,6 @@ create_kind_cluster() {
     echo
 }
 
-install_local-path-provisioner() {
-    # kind doesn't support Dynamic PVC provisioning yet, this is one way to get it working
-    # https://github.com/rancher/local-path-provisioner
-
-    # Remove default storage class. It will be recreated by local-path-provisioner
-    kubectl delete storageclass standard
-
-    echo 'Installing local-path-provisioner...'
-    kubectl apply -f examples/kind/test/local-path-provisioner.yaml
-    echo
-}
-
 test_e2e() {
     go test -cover -race -tags=integration ./...
     echo
@@ -51,7 +37,6 @@ main() {
     trap cleanup EXIT
 
     create_kind_cluster
-    install_local-path-provisioner
     test_e2e
 }
 

examples/kind/test/e2e-kind.sh

@@ -5,9 +5,9 @@ set -o nounset
 set -o pipefail
 
 readonly CT_VERSION=v3.0.0-beta.1
-readonly KIND_VERSION=v0.5.1
+readonly KIND_VERSION=v0.7.0
 readonly CLUSTER_NAME=chart-testing
-readonly K8S_VERSION=v1.15.3
+readonly K8S_VERSION=v1.17.0
 
 run_ct_container() {
     echo 'Running ct container...'
@@ -40,12 +40,8 @@ create_kind_cluster() {
 
     kind create cluster --name "$CLUSTER_NAME" --config test/kind-config.yaml --image "kindest/node:$K8S_VERSION" --wait 60s
 
-    docker_exec mkdir -p /root/.kube
-
     echo 'Copying kubeconfig to container...'
-    local kubeconfig
-    kubeconfig="$(kind get kubeconfig-path --name "$CLUSTER_NAME")"
-    docker cp "$kubeconfig" ct:/root/.kube/config
+    docker cp /root/.kube/config ct:/root/.kube/config
 
     docker_exec kubectl cluster-info
     echo
@@ -57,18 +53,6 @@ create_kind_cluster() {
     echo
 }
 
-install_local-path-provisioner() {
-    # kind doesn't support Dynamic PVC provisioning yet, this is one ways to get it working
-    # https://github.com/rancher/local-path-provisioner
-
-    # Remove default storage class. It will be recreated by local-path-provisioner
-    docker_exec kubectl delete storageclass standard
-
-    echo 'Installing local-path-provisioner...'
-    docker_exec kubectl apply -f test/local-path-provisioner.yaml
-    echo
-}
-
 install_charts() {
     docker_exec ct install
     echo
@@ -79,7 +63,6 @@ main() {
     trap cleanup EXIT
 
     create_kind_cluster
-    install_local-path-provisioner
     install_charts
 }