From fe73a41286920599592e98cdab67b4802daf496b Mon Sep 17 00:00:00 2001 From: Waldemar Date: Wed, 16 Jul 2025 15:22:11 +0200 Subject: [PATCH] Added patch to add cluster specific values --- registry/base/core/argocd.yaml | 12 +++--------- registry/base/core/kustomization.yaml | 2 ++ .../clusters/t09.de/abc/core/argocd/values.yaml | 0 .../clusters/t09.de/abc/kustomization.yaml | 11 +++++++++++ registry/overlays/clusters/t09.de/abc/patch.yaml | 16 ++++++++++++++++ 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 registry/base/core/kustomization.yaml create mode 100644 registry/overlays/clusters/t09.de/abc/core/argocd/values.yaml create mode 100644 registry/overlays/clusters/t09.de/abc/kustomization.yaml create mode 100644 registry/overlays/clusters/t09.de/abc/patch.yaml diff --git a/registry/base/core/argocd.yaml b/registry/base/core/argocd.yaml index aa0c3d7..63f793e 100644 --- a/registry/base/core/argocd.yaml +++ b/registry/base/core/argocd.yaml @@ -18,18 +18,12 @@ spec: name: in-cluster namespace: argocd sources: - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/argocd-helm.git + - repoURL: https://edp.buildth.ing/DevFW-CICD/argocd-helm.git path: charts/argo-cd - # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged - # As logout make problems, it is suggested to switch from path based routing to an own argocd domain, - # similar to the CNOE amazon reference implementation and in our case, Forgejo targetRevision: argo-cd-7.8.14-depends helm: valueFiles: - - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/argocd/values.yaml - - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} + - $values/registry/base/core/argocd/values.yaml + - repoURL: https://edp.buildth.ing/waldemar.kindler/edp-gitops targetRevision: HEAD ref: values - - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} - targetRevision: HEAD - path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/argocd/manifests" \ No newline at end of file diff --git a/registry/base/core/kustomization.yaml b/registry/base/core/kustomization.yaml new file mode 100644 index 0000000..61548bd --- /dev/null +++ b/registry/base/core/kustomization.yaml @@ -0,0 +1,2 @@ +resources: + - argocd.yaml diff --git a/registry/overlays/clusters/t09.de/abc/core/argocd/values.yaml b/registry/overlays/clusters/t09.de/abc/core/argocd/values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/registry/overlays/clusters/t09.de/abc/kustomization.yaml b/registry/overlays/clusters/t09.de/abc/kustomization.yaml new file mode 100644 index 0000000..cdbc88e --- /dev/null +++ b/registry/overlays/clusters/t09.de/abc/kustomization.yaml @@ -0,0 +1,11 @@ +resources: + - ../../../../base/core/ + +patches: + - target: + kind: Application + patch: | + - op: add + path: /spec/sources/0/helm/valueFiles/- + value: + $values/registry/overlays/clusters/t09.de/abc/core/argocd/values.yaml diff --git a/registry/overlays/clusters/t09.de/abc/patch.yaml b/registry/overlays/clusters/t09.de/abc/patch.yaml new file mode 100644 index 0000000..7f63392 --- /dev/null +++ b/registry/overlays/clusters/t09.de/abc/patch.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: argocd + namespace: argocd + labels: + env: dev +spec: + sources: + - repoURL: https://edp.buildth.ing/DevFW-CICD/argocd-helm.git + path: charts/argo-cd + targetRevision: argo-cd-7.8.14-depends + helm: + valueFiles: + - $values/registry/base/core/argocd/values.yaml + - $values/registry/overlays/clusters/t09.de/abc/core/argocd/values.yaml