From 07a21ad5cbfff03037864ad458114ac6c3fb26e3 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Thu, 2 Jul 2020 20:52:25 +0200
Subject: [PATCH 1/2] Add missing path to secrets

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 774f13d..e02cf83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ kubernetes:
     - kubectl config set-credentials sa --token="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)"
     - kubectl config set-context local --cluster=k8s --user=sa --namespace=turniere-backend
     - gem install krane
-    - krane render -f kubernetes --current-sha "$CI_COMMIT_SHA" | krane deploy turniere-backend local -f -
+    - krane render -f kubernetes --current-sha "$CI_COMMIT_SHA" | krane deploy turniere-backend local -f kubernetes/secrets.ejson -
 
 deploy_watchtower:
   tags:

From c89cefd6b53118ab417ceff3162b85e60ed0741b Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Thu, 2 Jul 2020 20:56:04 +0200
Subject: [PATCH 2/2] Add option to force deployment using $FORCE_DEPLOY

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e02cf83..50be965 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,10 @@ kubernetes:
     - turniere-deploy
   stage: deploy
   only:
-    - master
+    refs:
+      - master
+    variables:
+      - $FORCE_DEPLOY
   image: ruby
   variables:
     KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: gitlab-deploy
@@ -58,7 +61,10 @@ deploy_watchtower:
     - docker
   stage: deploy
   only:
-    - master
+    refs:
+      - master
+    variables:
+      - $FORCE_DEPLOY
   image: docker
   services:
     - docker:dind