From 4761fef87c759f8585b21138420a132727746749 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Tue, 3 Jun 2025 14:19:47 +0200 Subject: [PATCH] feat(forgejo): Resolved duplicate forgejo argocd application name --- template/registry/forgejo.yaml | 2 +- template/stacks/forgejo/forgejo-runner.yaml | 2 +- .../stacks/forgejo/{forgejo => forgejo-server}/values.yaml | 0 template/stacks/forgejo/forgejo.yaml | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename template/stacks/forgejo/{forgejo => forgejo-server}/values.yaml (100%) diff --git a/template/registry/forgejo.yaml b/template/registry/forgejo.yaml index 7e105ba..75fdcae 100644 --- a/template/registry/forgejo.yaml +++ b/template/registry/forgejo.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: forgejostack + name: forgejo namespace: argocd labels: env: dev diff --git a/template/stacks/forgejo/forgejo-runner.yaml b/template/stacks/forgejo/forgejo-runner.yaml index f8960be..54c183a 100644 --- a/template/stacks/forgejo/forgejo-runner.yaml +++ b/template/stacks/forgejo/forgejo-runner.yaml @@ -21,4 +21,4 @@ spec: source: repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} targetRevision: HEAD - path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/forgejo-runner" + path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-runner" diff --git a/template/stacks/forgejo/forgejo/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml similarity index 100% rename from template/stacks/forgejo/forgejo/values.yaml rename to template/stacks/forgejo/forgejo-server/values.yaml diff --git a/template/stacks/forgejo/forgejo.yaml b/template/stacks/forgejo/forgejo.yaml index 2123e48..9957f55 100644 --- a/template/stacks/forgejo/forgejo.yaml +++ b/template/stacks/forgejo/forgejo.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: forgejo + name: forgejo-server namespace: argocd labels: env: dev @@ -23,7 +23,7 @@ spec: targetRevision: v12.0.0-depends helm: valueFiles: - - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/forgejo/values.yaml + - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-server/values.yaml - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} targetRevision: HEAD ref: values