From e971ab27d70827564771b01aa95f8fdcc0061cbc Mon Sep 17 00:00:00 2001
From: Dan Manners <daniel.a.manners@gmail.com>
Date: Sat, 16 Sep 2023 03:51:51 -0400
Subject: [PATCH] Updating ArgoCD deployment

---
 .gitignore                                         |  1 +
 .../bootstrapping-onprem/08-argocd/values.yaml     | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed77c5d5..e7831ab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ keys/
 inventory/turing-pi
 .terraform/
 charts/
+.tests/
 
 # Files
 *.pem
diff --git a/manifests/bootstrapping-onprem/08-argocd/values.yaml b/manifests/bootstrapping-onprem/08-argocd/values.yaml
index 40704f66..d0bd8fd6 100644
--- a/manifests/bootstrapping-onprem/08-argocd/values.yaml
+++ b/manifests/bootstrapping-onprem/08-argocd/values.yaml
@@ -73,11 +73,17 @@ repoServer:
     value: '/.config'
   # Add the KSOPS plugin
   initContainers:
-  - name: install-ksops
-    image: viaductoss/ksops:v4.2.1
-    command: ["/bin/sh", "-c"]
+  - name: install-custom-tools
+    image: docker.io/library/alpine:latest
+    command: ["ash", "-c"]
     args:
-    - echo "Installing KSOPS..."; mv ksops /custom-tools/; mv kustomize /custom-tools/; echo "Done.";
+    - |
+      export ARCH=$(uname -m | awk '{print ($1=="x86_64" ? "x86_64" : ($1=="aarch64" ? "arm64" : "unknown"))}')
+      wget -qO- https://github.com/viaduct-ai/kustomize-sops/releases/download/v4.2.1/ksops_4.2.1_Linux_${ARCH}.tar.gz | tar -xvzf -
+      export ARCH=$(uname -m | awk '{print ($1=="x86_64" ? "amd64" : ($1=="aarch64" ? "arm64" : "unknown"))}')
+      wget -qO- https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.1.1/kustomize_v5.1.1_linux_${ARCH}.tar.gz | tar -xvzf -
+      mv kustomize ksops /custom-tools/
+      chown 999:999 /custom-tools/{ksops,kustomize}
     volumeMounts:
     - mountPath: /custom-tools
       name: custom-tools