From b55da8c55a93f09a6da6af05ac978e3303ac8e49 Mon Sep 17 00:00:00 2001
From: Deni Bertovic <deni@denibertovic.com>
Date: Mon, 21 Jan 2019 18:33:39 +0100
Subject: [PATCH] Fixes helm permission issues

---
 .gitlab-ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bf3548..e9059d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,10 +37,10 @@ variables:
     kubectl apply -f <(envsubst <etc/kube/cron_deployment_template.yaml) &&
     kubectl apply -f <(envsubst <etc/kube/hoogle_deployment_template.yaml)
   - &HELMUPGRADE
-    helm upgrade -i "${DEPLOYMENT_NAME}" etc/helm --set name="${DEPLOYMENT_NAME}" --set app="${DEPLOYMENT_APP}" --set hoogleName="${HOOGLE_DEPLOYMENT_NAME}" --set hoogleApp="${HOOGLE_DEPLOYMENT_APP}" --set cronName="${CRON_DEPLOYMENT_NAME}" --set cronApp="${HOOGLE_DEPLOYMENT_APP}" --set image.image="${DEPLOYMENT_IMAGE}" --values etc/helm/values/$CI_ENVIRONMENT_NAME.yaml --namespace fpco-public
+    helm --tiller-namespace ${KUBE_NAMESPACE} upgrade -i "${DEPLOYMENT_NAME}" etc/helm --set name="${DEPLOYMENT_NAME}" --set app="${DEPLOYMENT_APP}" --set hoogleName="${HOOGLE_DEPLOYMENT_NAME}" --set hoogleApp="${HOOGLE_DEPLOYMENT_APP}" --set cronName="${CRON_DEPLOYMENT_NAME}" --set cronApp="${HOOGLE_DEPLOYMENT_APP}" --set image.image="${DEPLOYMENT_IMAGE}" --values etc/helm/values/$CI_ENVIRONMENT_NAME.yaml --namespace ${KUBE_NAMESPACE}
   - &HELMCHECK
-    helm ls &&
-    helm status "${DEPLOYMENT_NAME}"
+    helm --tiller-namespace ${KUBE_NAMESPACE} ls &&
+    helm --tiller-namespace ${KUBE_NAMESPACE} status "${DEPLOYMENT_NAME}"
 
     #build:
     #  stage: build
@@ -111,6 +111,5 @@ deploy_ci:
     HOST: ci.stackage.org
   script:
     - *KUBELOGIN
-    - echo $KUBE_NAMESPACE
     - *HELMUPGRADE
-      #- *HELMCHECK
+    - *HELMCHECK