From 3126f5e8fd3e1feea763d22c992547cc54a0a357 Mon Sep 17 00:00:00 2001
From: Aram Peres <aram.peres@wavy.fm>
Date: Sun, 20 Dec 2020 17:37:49 -0500
Subject: [PATCH] Fix helm3 commands

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b01118..cf2fbf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ website:deploy:
 
     # Deploy using helm chart
     - cd ${WEBSITE_SRC}
-    - helm upgrade --install --force --namespace ${DEPLOY_NAMESPACE} --set image.name=${WEBSITE_IMAGE},image.tag=${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} website ./chart/website
+    - helm upgrade --install --namespace ${DEPLOY_NAMESPACE} --set image.name=${WEBSITE_IMAGE},image.tag=${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} website ./chart/website
   only:
     refs:
       - master
@@ -75,7 +75,7 @@ abitibi:deploy:
 
     # Deploy using helm chart
     - cd ${ABITIBI_SRC}
-    - helm upgrade --install --force --namespace ${DEPLOY_NAMESPACE} --set image.name=${ABITIBI_IMAGE},image.tag=${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} abitibi ./chart/abitibi
+    - helm upgrade --install --namespace ${DEPLOY_NAMESPACE} --set image.name=${ABITIBI_IMAGE},image.tag=${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} abitibi ./chart/abitibi
   only:
     refs:
       - master
@@ -117,7 +117,7 @@ teamspeak:deploy:
     # Deploy using helm chart
     - cd ${TEAMSPEAK_SRC}/chart
     - mkdir -p manifests/
-    - helm template ./teamspeak/ --output-dir manifests/ --name teamspeak -f ./teamspeak/values.yaml
+    - helm template teamspeak ./teamspeak/ --output-dir manifests/ -f ./teamspeak/values.yaml
     - kubectl apply --namespace ${DEPLOY_NAMESPACE} -R -f manifests/
   only:
     refs:
@@ -184,7 +184,7 @@ chartmuseum:deploy:
     # Deploy using helm chart
     - cd ${CHARTMUSEUM_SRC}
     - helm init --client-only && helm repo update
-    - helm upgrade --install --force --namespace ${DEPLOY_NAMESPACE} -f values.yaml chartmuseum stable/chartmuseum
+    - helm upgrade --install --namespace ${DEPLOY_NAMESPACE} -f values.yaml chartmuseum stable/chartmuseum
   only:
     refs:
       - master