From 8e8ff2a88977d642ffaec6735c205525c1bc0cc1 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Thu, 12 Jan 2023 07:05:10 +0100
Subject: [PATCH] invidious: Fix flaky init container

---
 deploy/base/deploy-invidious.yaml | 7 ++++++-
 deploy/base/invidious-init.sh     | 6 ++++++
 deploy/base/kustomization.yaml    | 6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 deploy/base/invidious-init.sh

diff --git a/deploy/base/deploy-invidious.yaml b/deploy/base/deploy-invidious.yaml
index 8db4939..0894cb5 100644
--- a/deploy/base/deploy-invidious.yaml
+++ b/deploy/base/deploy-invidious.yaml
@@ -27,7 +27,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: data
-        command: ["git", "clone", "--depth", "1", "https://github.com/iv-org/invidious.git", "/data/repo"]
+        - mountPath: /scripts
+          name: scripts
+        command: ["/bin/sh", "/scripts/init.sh"]
       - image: jbergknoff/postgresql-client:latest
         imagePullPolicy: IfNotPresent
         name: init-invidious-db
@@ -117,3 +119,6 @@ spec:
       - name: config
         configMap:
           name: invidious-config
+      - name: scripts
+        configMap:
+          name: invidious-scripts
diff --git a/deploy/base/invidious-init.sh b/deploy/base/invidious-init.sh
new file mode 100644
index 0000000..1d122aa
--- /dev/null
+++ b/deploy/base/invidious-init.sh
@@ -0,0 +1,6 @@
+if [ -d /data/repo ]; then
+  cd /data/repo
+  git pull
+else
+  git clone --depth 1 https://github.com/iv-org/invidious.git /data/repo
+fi
diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml
index 4d55c2d..1d7d735 100644
--- a/deploy/base/kustomization.yaml
+++ b/deploy/base/kustomization.yaml
@@ -108,6 +108,12 @@ configMapGenerator:
   files:
   - init-directory-structure.sh=gitea-init-directory-structure.sh
   - setup.sh=gitea-setup.sh
+- name: invidious-scripts
+  files:
+  - init.sh=invidious-init.sh
+  options:
+    labels:
+      app: invidious
 
 secretGenerator:
 - name: aws-do-external-dns-credentials