From 378ee6bd37a279a1e6f8508cdda5151d8c522f69 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sun, 14 Sep 2025 07:58:52 +0200 Subject: [PATCH] fix: don't auto-patch argo in bootstrap --- bootstrap/deploy.sh | 6 +++--- bootstrap/helmfile-cmp/argo-repo-server-patch.yaml | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bootstrap/deploy.sh b/bootstrap/deploy.sh index ea259b23..f4ef6a5e 100755 --- a/bootstrap/deploy.sh +++ b/bootstrap/deploy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -helm upgrade --install --create-namespace argocd argo/argo-cd -n argocd -kubectl patch -n argocd deployment argocd-repo-server --type merge --patch-file helmfile-cmp/argo-repo-server-patch.yaml -helm upgrade --install --create-namespace --values values.yaml argocd-apps argo/argocd-apps -n argocd +helm upgrade --install --create-namespace argocd argo/argo-cd -n argocd --version 7.8.0 +helm upgrade --install --create-namespace --values values.yaml argocd-apps argo/argocd-apps -n argocd --version 0.0.1 +#kubectl patch -n argocd deployment argocd-repo-server --type merge --patch-file helmfile-cmp/argo-repo-server-patch.yaml diff --git a/bootstrap/helmfile-cmp/argo-repo-server-patch.yaml b/bootstrap/helmfile-cmp/argo-repo-server-patch.yaml index 4588d44d..2521459b 100644 --- a/bootstrap/helmfile-cmp/argo-repo-server-patch.yaml +++ b/bootstrap/helmfile-cmp/argo-repo-server-patch.yaml @@ -1,6 +1,10 @@ +# Don't apply this patch with kubectl, it overwrites the original repo-server! +# Instead merge by hand in the bootstap process. spec: template: spec: + imagePullSecrets: + - name: gitlab-pull-secret containers: - command: - /var/run/argocd/argocd-cmp-server @@ -18,6 +22,6 @@ spec: - mountPath: /home/argocd/cmp-server/plugins name: plugins - mountPath: /tmp - name: cmp-tmp + name: tmp - mountPath: /helm-working-dir name: helm-working-dir