Support Helm 3 (#140)

Author: zelima

.github/workflows/main.yml

@@ -16,6 +16,7 @@ jobs:
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
+      ## TODO: Bring me Back. Builds started failing cause of https://github.com/kubernetes/minikube/issues/7903
       # - name: minikube
       #   env:
       #     K8_PROVIDER: minikube
@@ -38,7 +39,7 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           TRAVIS_REPO_SLUG: ${{ secrets.TRAVIS_REPO_SLUG }}
-          HELM_VERSION: v2.16.11
+          HELM_VERSION: v3.5.2
 
         run: |
           mkdir $HOME/bin

.travis.sh

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-TAG="${GITHUB_SHA:-${GITHUB_REF	}}"
+REF="${GITHUB_REF:-${GITHUB_SHA}}"
+TAG=${REF##*/}
 AWS_IAM_AUTHENTICATOR_VERSION="1.14.6/2019-08-22"
 TERRAFORM_VERSION=0.12.18
 PACKER_VERSION=1.5.1
-HELM_VERSION="${HELM_VERSION:-v2.16.1}"
+HELM_VERSION="${HELM_VERSION:-v3.5.2}"
 
 if [ "${1}" == "install" ]; then
     ! docker pull viderum/ckan-cloud-operator:latest && echo Failed to pull image && exit 1

.travis.yml

@@ -68,7 +68,7 @@ jobs:
       if: (type = push AND (branch = master OR tag IS present)) OR (type != pull_request AND commit_message =~ /#azure/)
       env:
         - K8_PROVIDER=azure
-        - HELM_VERSION=v2.16.1
+        - HELM_VERSION=v3.5.2
       before_install: pip install -e .
       install: bash .travis.sh install-tools
       script:

VERSION.txt

@@ -1 +1 @@
-0.5.0
+v0.7.0-rc1

ckan_cloud_operator/drivers/helm/driver.py

@@ -38,8 +38,9 @@ def init(tiller_namespace_name):
     }
     kubectl.apply(tiller_service_account)
     kubectl.apply(cluster_role_binding)
+    tiller_cmd = '' if _check_helm_version() == 3 else f' --tiller-namespace {tiller_namespace_name}'
     subprocess.check_call(
-        f'helm init --upgrade --service-account {tiller_namespace_name}-tiller --tiller-namespace {tiller_namespace_name} --history-max 10',
+        f'helm init --upgrade --stable-repo-url https://charts.helm.sh/stable --service-account {tiller_namespace_name}-tiller --history-max 10' + tiller_cmd,
         shell=True
     )
 
@@ -55,13 +56,15 @@ def deploy(tiller_namespace, chart_repo, chart_name, chart_version, release_name
 
     version_args = f'--version "{chart_version}"' if chart_version else ''
     dry_run_args = '--dry-run --debug'
-    cmd = f'helm --tiller-namespace {tiller_namespace} upgrade {release_name} {chart_name} ' \
+    tiller_cmd = '' if _check_helm_version() == 3 else f' --tiller-namespace {tiller_namespace}'
+    cmd = f'helm upgrade {release_name} {chart_name} ' \
           f' --install --namespace "{namespace}" -i {version_args}'
     if values_filename:
         cmd += f' -f {values_filename}'
     elif values:
         for key, value in values.items():
             cmd += f' --set {key}={value}'
+    cmd += tiller_cmd
     logs.info('Running helm upgrade --dry-run')
     if logs.CKAN_CLOUD_OPERATOR_DEBUG_FILE:
         logs.info(f'helm dry run debug output is written to debug log file: {logs.CKAN_CLOUD_OPERATOR_DEBUG_FILE}')
@@ -75,4 +78,8 @@ def deploy(tiller_namespace, chart_repo, chart_name, chart_version, release_name
 
 
 def delete(tiller_namespace, release_name):
-    subprocess.check_call(f'helm --tiller-namespace {tiller_namespace} delete --purge --timeout 5 {release_name}', shell=True)
+    tiller_cmd = '' if _check_helm_version() == 3 else f' --tiller-namespace {tiller_namespace}'
+    subprocess.check_call(f'helm delete --purge --timeout 5 {release_name}' + tiller_cmd, shell=True)
+
+def _check_helm_version():
+    return 3 if 'v3.' in str(subprocess.check_output('helm version -c', shell=True)) else 2

docker-build.sh

@@ -2,7 +2,8 @@
 
 date +%Y-%m-%d\ %H:%M | tee /etc/ckan-cloud-operator-build-info
 hostname | tee -a /etc/ckan-cloud-operator-build-info
-
+HELM_VERSION="${HELM_VERSION:-v3.5.2}"
+echo $HELM_VERSION
 (
   echo == system dependencies, gcloud-sdk &&\
   apt-get update && apt-get install -y gnupg bash-completion build-essential jq python-pip &&\
@@ -11,8 +12,8 @@ hostname | tee -a /etc/ckan-cloud-operator-build-info
   curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
   apt-get update -y && apt-get install -y google-cloud-sdk kubectl postgresql nano dnsutils &&\
   echo == helm, tiller &&\
-  wget -q https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz &&\
-  tar -xzf helm-v2.17.0-linux-amd64.tar.gz &&\
+  wget -q https://get.helm.sh/helm-$HELM_VERSION-linux-amd64.tar.gz &&\
+  tar -xzf helm-$HELM_VERSION-linux-amd64.tar.gz &&\
   mv linux-amd64/helm /usr/local/bin/ && mv linux-amd64/tiller /usr/local/bin/ &&\
   chmod +x /usr/local/bin/helm /usr/local/bin/tiller && rm -rf linux-amd64 &&\
   echo == minio client &&\