From ec6ba8da615a7a4c47c804fe2905943aed98c5a6 Mon Sep 17 00:00:00 2001
From: momothereal <momothereal.mc@gmail.com>
Date: Sun, 27 Oct 2019 15:43:43 -0400
Subject: [PATCH] Fix defiant tag

---
 .gitlab-ci.yml                    | 2 +-
 defiant/chart/defiant/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb2ae5f..e99c1d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,7 +133,7 @@ defiant:deploy:
     - cd ${DEFIANT_SRC}/chart
     - mkdir -p manifests/
     - helm template ./defiant/ --output-dir manifests/ --name defiant -f ./defiant/values.yaml
-    - kubectl apply --namespace ${DEPLOY_NAMESPACE} -R -f manifests/
+    - kubectl apply --namespace ${DEPLOY_NAMESPACE} --set image.name=${DEFIANT_IMAGE} --set image.tag=${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} -R -f manifests/
   only:
     refs:
       - master
diff --git a/defiant/chart/defiant/values.yaml b/defiant/chart/defiant/values.yaml
index 3eb3184..6f04678 100644
--- a/defiant/chart/defiant/values.yaml
+++ b/defiant/chart/defiant/values.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: registry.gitlab.com/momothereal/momoperes.ca/defiant
+  name: registry.gitlab.com/momothereal/momoperes.ca/defiant
   tag: latest
   pullPolicy: Always