From b9ef5158f92cc21425643e7bb619431ed550f30d Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Thu, 2 Jul 2020 22:03:55 +0200
Subject: [PATCH 1/2] Use krane because kubernetes-deploy is deprecated

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 127b8d2..f59e294 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,8 +29,8 @@ kubernetes:
     - kubectl config set-cluster k8s --server="https://kubernetes.default.svc" --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
     - 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-frontend
-    - gem install kubernetes-deploy --version '=0.29.0'
-    - REVISION=$CI_COMMIT_SHA kubernetes-deploy --template-dir kubernetes turniere-frontend local
+    - gem install krane
+    - krane render -f kubernetes --current-sha "$CI_COMMIT_SHA" | krane deploy turniere-frontend local -f -
 
 deploy_watchtower:
   tags:

From 35372445799d5c715f986707f701dcee76a60726 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Thu, 2 Jul 2020 22:05:02 +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 f59e294..dab906b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,10 @@ kubernetes:
     - turniere-deploy
   stage: deploy
   only:
-    - master
+    refs:
+      - master
+    variables:
+      - $FORCE_DEPLOY
   image: ruby
   variables:
     KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: gitlab-deploy
@@ -37,7 +40,10 @@ deploy_watchtower:
     - docker
   stage: deploy
   only:
-    - master
+    refs:
+      - master
+    variables:
+      - $FORCE_DEPLOY
   image: docker
   services:
     - docker:dind