From 73e0319591d9666bfcf95c89151345ee9b9e2484 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 23 Jun 2025 10:58:43 +0000 Subject: [PATCH] fix: actually wrap the cmp-server and not the repo-server --- Dockerfile | 10 ++++------ ...o-server-wrapper.sh => argocd-cmp-server-wrapper.sh | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) rename argocd-repo-server-wrapper.sh => argocd-cmp-server-wrapper.sh (90%) diff --git a/Dockerfile b/Dockerfile index e1b1005..8dc6341 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/argoproj/argocd:v3.0.9 +FROM quay.io/argoproj/argocd:v3.0.6 # renovate: datasource=github-releases depName=sops packageName=getsops/sops ARG SOPS_VERSION=v3.10.2 @@ -45,12 +45,10 @@ RUN mkdir -p /home/argocd/.local/share/helm/plugins && \ chown -R root: /home/argocd/.local/share/helm && \ ln -sf /home/argocd/.local/share/helm/plugins/helm-secrets/scripts/wrapper/helm.sh /usr/local/sbin/helm && \ sed -i -e 's/secrets/secrets --evaluate-templates/' /home/argocd/.local/share/helm/plugins/helm-secrets/scripts/wrapper/helm.sh && \ - rm -f /usr/local/bin/argocd-repo-server + rm -f /usr/local/bin/argocd-cmp-server - - -# replace argocd-repo-server with wrapper to install kubectl config -ADD argocd-repo-server-wrapper.sh /usr/local/bin/argocd-repo-server +# replace argocd-cmp-server with wrapper to install kubectl config +ADD argocd-cmp-server-wrapper.sh /usr/local/bin/argocd-cmp-server # register vals "cmp plugin" ADD plugin.yaml /home/argocd/cmp-server/config/plugin.yaml diff --git a/argocd-repo-server-wrapper.sh b/argocd-cmp-server-wrapper.sh similarity index 90% rename from argocd-repo-server-wrapper.sh rename to argocd-cmp-server-wrapper.sh index c87638e..409ba7e 100755 --- a/argocd-repo-server-wrapper.sh +++ b/argocd-cmp-server-wrapper.sh @@ -28,4 +28,4 @@ EOF chmod 600 $KUBECONFIG -ARGOCD_BINARY_NAME=argocd-repo-server /usr/local/bin/argocd $@ +ARGOCD_BINARY_NAME=argocd-cmp-server /usr/local/bin/argocd $@