From 9c489ab651adf70cec6ae44549db9da419bf7099 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 30 May 2024 10:55:07 +0200 Subject: [PATCH] fix: update argo helm plugin setup --- argo/kustomize-helm-with-rewrite/Dockerfile | 5 +---- argo/kustomize-helm-with-rewrite/deploy.sh | 2 +- argo/staging-vcluster.yaml | 8 +++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/argo/kustomize-helm-with-rewrite/Dockerfile b/argo/kustomize-helm-with-rewrite/Dockerfile index 4675dac6..8a2ffbdf 100644 --- a/argo/kustomize-helm-with-rewrite/Dockerfile +++ b/argo/kustomize-helm-with-rewrite/Dockerfile @@ -1,10 +1,7 @@ -FROM alpine/k8s:1.28.3 +FROM alpine/k8s:1.28.9 RUN mkdir -p /home/argocd/cmp-server/config/ COPY plugin.yaml /home/argocd/cmp-server/config/ WORKDIR /plugin COPY init.sh get-values.sh generate.sh ./ - - - diff --git a/argo/kustomize-helm-with-rewrite/deploy.sh b/argo/kustomize-helm-with-rewrite/deploy.sh index 3aa05ecf..0a188923 100644 --- a/argo/kustomize-helm-with-rewrite/deploy.sh +++ b/argo/kustomize-helm-with-rewrite/deploy.sh @@ -1,6 +1,6 @@ #!/bin/sh -img=registry.gitlab.com/oceanbox/gitops-manifests/kustomize-helm-with-rewrite +img=registry.gitlab.com/oceanbox/manifests/kustomize-helm-with-rewrite tag=${1:-latest} docker build -t $img:$tag . diff --git a/argo/staging-vcluster.yaml b/argo/staging-vcluster.yaml index 86c627fe..963e403e 100644 --- a/argo/staging-vcluster.yaml +++ b/argo/staging-vcluster.yaml @@ -5,14 +5,12 @@ metadata: managed-by: argocd.argoproj.io labels: argocd.argoproj.io/secret-type: cluster - name: staging-vcluster + name: cluster-staging-vcluster namespace: argocd stringData: config: | - {"bearerToken":"eyJhbGciOiJSUzI1NiIsImtpZCI6IlVrakhGancyRzVMajNvQ3Jjb2FEU0kwRnlQeGsxc0Z3OThzLWV6akljVzAifQ.eyJhdWQiOlsiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXIubG9jYWwiLCJodHRwczovL2t1YmVybmV0ZXMuZGVmYXVsdC5zdmMiLCJodHRwczovL2t1YmVybmV0ZXMuZGVmYXVsdCJdLCJleHAiOjIwMjM3MjEwMDksImlhdCI6MTcwODM2MTAwOSwiaXNzIjoiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXIubG9jYWwiLCJrdWJlcm5ldGVzLmlvIjp7Im5hbWVzcGFjZSI6Imt1YmUtc3lzdGVtIiwic2VydmljZWFjY291bnQiOnsibmFtZSI6ImFkbWluIiwidWlkIjoiMDRlOGJlZDQtYWUwNy00MTBiLWI4NTYtNzg3MTkzNDAzYjcyIn19LCJuYmYiOjE3MDgzNjEwMDksInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTphZG1pbiJ9.TJuQb9dpgOU6w42-WSJQmu39CZ7NyXWks6itH5qtUUkOvkwRwEtChV-53epM1HNOpK3mj2IWlJ7MaUb5AVFMx0alUJthBX_kL3mjdvUdn2MbPl-S0UFPclp8JoYeALjwtSFkuch1HqlMT7s-BbhXowo8AVFXDJE3rUJBrzzFqQ_e1IIf327qUfyo_TidwVoiya7q6cRU1n-XsP6sE0cgOxnScHXZ-DpysydjKCqXFYbnz9KYVagsOdK4LPb3x-Qb6Ae4PGJAfo3myzmiha3bTGO8HFF4WmMTWrlqeCXTPjER1vVJ_RQMY_LF4G8Of9zIX-8gvTZLcQAQ6BnlmY4QxQ","tlsClientConfig":{"insecure":true}} + {"bearerToken":"eyJhbGciOiJSUzI1NiIsImtpZCI6InhKNmNNemw4V01jR0cxUHJ4ajE3bTdQRDlKd1ZyQUQ0cDFPcXRuVDBFbWsifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi10b2tlbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImUyNjQ2MDgzLTNjMDMtNDc0Ni1iMGIxLWViOGRmMzY3NTNiMiIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTphZG1pbiJ9.hXQzh4mus2yPwXz-EyowgSpOKgOk7uDU8z-dH-sZJ-UgzxQFOxABfkjD4Kb4JYlXrr_zkMO7n_zkaDOl3iFDCDS2Pury7hsIlJNKETYk-_llH0RYI9DYzAB5PkeOyuKhmRq8eklynq5ObPtk7WVuj3Bp-64uSqfX-WvxqoE0dfh0erSVcU7BwwjRdeDnO01xzv5zXXAYkOmk6e5DGOLBdUMD8kDZE0_NEa-MKCVkl78sc2mCsOMOUhzXoCduvc92hfnoFEfoTKe7xHwLeUim4HvVfD9czXOpRtHKXgEsk0UGtj0xg7D70uftUIxpr4a8rbWceM4eyGtXpjPUm1mh1Q","tlsClientConfig":{"insecure":true}} name: staging-vcluster - server: https://staging-vcluster.staging-vcluster:443 + server: https://staging-vcluster.staging-vcluster type: Opaque - -