From dd8feba99687f1a2fb85d42884b0f640d3504488 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Wed, 23 Apr 2025 15:30:19 +0200 Subject: [PATCH] Combined helm and kubernetes deployments into a singel argocd application --- template/stacks/core/forgejo-sso.yaml | 29 ------------------- template/stacks/core/forgejo.yaml | 3 ++ .../manifests}/secret-forgejo.yaml | 0 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 template/stacks/core/forgejo-sso.yaml rename template/stacks/core/{forgejo-sso => forgejo/manifests}/secret-forgejo.yaml (100%) diff --git a/template/stacks/core/forgejo-sso.yaml b/template/stacks/core/forgejo-sso.yaml deleted file mode 100644 index 463d6ce..0000000 --- a/template/stacks/core/forgejo-sso.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: forgejo-sso - namespace: argocd - labels: - env: dev - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} - targetRevision: HEAD - path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/forgejo-sso" - destination: - server: "https://kubernetes.default.svc" - namespace: gitea - syncPolicy: - syncOptions: - - CreateNamespace=true - automated: - selfHeal: true - retry: - limit: -1 - backoff: - duration: 15s - factor: 1 - maxDuration: 15s diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml index 441afe4..e67f8c3 100644 --- a/template/stacks/core/forgejo.yaml +++ b/template/stacks/core/forgejo.yaml @@ -25,3 +25,6 @@ spec: - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} 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/forgejo/manifests" diff --git a/template/stacks/core/forgejo-sso/secret-forgejo.yaml b/template/stacks/core/forgejo/manifests/secret-forgejo.yaml similarity index 100% rename from template/stacks/core/forgejo-sso/secret-forgejo.yaml rename to template/stacks/core/forgejo/manifests/secret-forgejo.yaml