[couchdb-helm] 01/03: Use Chart Testing v3

[wi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

willholley pushed a commit to branch prehashed-pw
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git

commit 1263d01c215501b4ae559355e1f1ad9f276fd586
Author: Will Holley <wi...@gmail.com>
AuthorDate: Mon Feb 17 10:57:42 2020 +0000

    Use Chart Testing v3
    
     * Chart Testing v3.0.0-beta.1
     * Kind to 0.7.0
     * Kubernetes 1.17
---
 test/ct.yaml     |  2 +-
 test/e2e-kind.sh | 33 ++++++---------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/test/ct.yaml b/test/ct.yaml
index d40aa57..1ba45a4 100644
--- a/test/ct.yaml
+++ b/test/ct.yaml
@@ -1 +1 @@
-helm-extra-args: --timeout 800
+helm-extra-args: --timeout 800s
diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 4cb57b4..efcebd1 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -4,10 +4,10 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-readonly CT_VERSION=v2.3.3
-readonly KIND_VERSION=v0.5.1
+readonly CT_VERSION=v3.0.0-beta.1
+readonly KIND_VERSION=v0.7.0
 readonly CLUSTER_NAME=chart-testing
-readonly K8S_VERSION=v1.14.3
+readonly K8S_VERSION=v1.17.0
 
 run_ct_container() {
     echo 'Running ct container...'
@@ -45,9 +45,10 @@ create_kind_cluster() {
     docker_exec mkdir -p /root/.kube
 
     echo 'Copying kubeconfig to container...'
-    local kubeconfig
-    kubeconfig="$(kind get kubeconfig-path --name "$CLUSTER_NAME")"
+    local kubeconfig=$(mktemp)
+    kind get kubeconfig --name "$CLUSTER_NAME" >"$kubeconfig"
     docker cp "$kubeconfig" ct:/root/.kube/config
+    rm "$kubeconfig"
 
     docker_exec kubectl cluster-info
     echo
@@ -59,26 +60,6 @@ create_kind_cluster() {
     echo
 }
 
-install_tiller() {
-    echo 'Installing Tiller...'
-    docker_exec kubectl --namespace kube-system create sa tiller
-    docker_exec kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
-    docker_exec helm init --service-account tiller --upgrade --wait
-    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 lint-and-install --charts couchdb --upgrade --chart-dirs .
     echo
@@ -89,8 +70,6 @@ main() {
     trap cleanup EXIT
 
     create_kind_cluster
-    install_local-path-provisioner
-    install_tiller
     install_charts
 }