From cef5f2ddc1af4fd5743dd65917bc1603fb9ce0db Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Wed, 9 Dec 2020 14:03:19 +0000
Subject: [PATCH] Always pull git-sync image

---
 manifests/git-sync.yaml | 46 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/manifests/git-sync.yaml b/manifests/git-sync.yaml
index f68b026..d5a5d07 100644
--- a/manifests/git-sync.yaml
+++ b/manifests/git-sync.yaml
@@ -11,6 +11,7 @@ metadata:
   annotations:
     kube-1password: cfo2ufhgem57clbscxetxgevue
     kube-1password/vault: Kubernetes
+    kube-1password/password-key: token
 type: Opaque
 data:
 ---
@@ -22,6 +23,31 @@ metadata:
   annotations:
     kube-1password: b7kpdlcvt7y63bozu3i4j4lojm
     kube-1password/vault: Kubernetes
+    kube-1password/password-key: token
+type: Opaque
+data:
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: git-sync-gitlab
+  namespace: git-sync
+  annotations:
+    kube-1password: t47v3xdgadiifgoi4wmqibrlty
+    kube-1password/vault: Kubernetes
+    kube-1password/password-key: token
+type: Opaque
+data:
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: git-sync-bitbucket
+  namespace: git-sync
+  annotations:
+    kube-1password: adrki45krr2tq34sug7dhdk5iy
+    kube-1password/vault: Kubernetes
+    kube-1password/password-key: token
 type: Opaque
 data:
 ---
@@ -32,23 +58,37 @@ metadata:
   namespace: git-sync
 spec:
   schedule: "0 */1 * * *"
+  concurrencyPolicy: Forbid
+  failedJobsHistoryLimit: 1
+  successfulJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      backoffLimit: 1
       template:
         spec:
           containers:
           - name: sync
             image: docker.cluster.fun/averagemarcus/git-sync:latest
-            imagePullPolicy: IfNotPresent
+            imagePullPolicy: Always
             env:
             - name: GITHUB_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: git-sync-github
-                  key: password
+                  key: token
             - name: GITEA_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: git-sync-gitea
-                  key: password
+                  key: token
+            - name: GITLAB_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: git-sync-gitlab
+                  key: token
+            - name: BITBUCKET_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: git-sync-bitbucket
+                  key: token
           restartPolicy: Never