Commit 2803dfbb authored by Thong Kuah's avatar Thong Kuah
Browse files

Merge branch 'failed-to-initialize-tiller' into 'master' 

Ensure tiller is still running

See merge request gitlab-org/cluster-integration/auto-deploy-image!9
parents 022f112b 6540d1f3

.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ test-initialize-tiller: 
    - download_k3s

    - start_k3s

    - auto-deploy initialize_tiller

    - ps aufx

    - helm ls --host "localhost:44134"



# disabled, doesn't look like k3s supports docker-registry secret

.test-create-secret:
@@ -179,7 +181,7 @@ test-persist-environment-url: 
    - auto-deploy initialize_tiller

    - auto-deploy download_chart

    - auto-deploy deploy

    - helm ls

    - helm ls --host "localhost:44134"



test-create-application-secret:

  <<: *test-job

src/bin/auto-deploy

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ function initialize_tiller() { 
  echo "Checking Tiller..."



  export HELM_HOST="localhost:44134"

  tiller -listen ${HELM_HOST} -alsologtostderr > /dev/null 2>&1 &

  nohup tiller -listen ${HELM_HOST} -alsologtostderr > /dev/null 2>&1 &

  echo "Tiller is listening on ${HELM_HOST}"



  if ! helm version --debug; then