Changes templates to be based on a central client repo

2025-04-22 19:36:14 +02:00 · 2025-04-22 19:36:14 +02:00 · d94a445f47
commit d94a445f47
parent 4eb6fa0908
32 changed files with 43 additions and 159 deletions
--- a/template/edfbuilder.yaml
+++ b/template/edfbuilder.yaml
@ -13,7 +13,7 @@ spec:
    namespace: argocd
  source:
    path: registry
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
    targetRevision: HEAD
  project: default
  syncPolicy:
--- a/template/registry/core.yaml
+++ b/template/registry/core.yaml
@ -13,7 +13,7 @@ spec:
    namespace: argocd
  source:
    path: stacks/core
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
    targetRevision: HEAD
  project: default
  syncPolicy:
--- a/template/registry/local-backup.yaml
+++ b/template/registry/local-backup.yaml
@ -13,7 +13,7 @@ spec:
    namespace: argocd
  source:
    path: stacks/local-backup
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
    targetRevision: HEAD
  project: default
  syncPolicy:
--- a/template/registry/monitoring.yaml
+++ b/template/registry/monitoring.yaml
@ -13,7 +13,7 @@ spec:
    namespace: argocd
  source:
    path: stacks/monitoring
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
    targetRevision: HEAD
  project: default
  syncPolicy:
--- a/template/registry/ref-implementation.yaml
+++ b/template/registry/ref-implementation.yaml
@ -13,7 +13,7 @@ spec:
    namespace: argocd
  source:
    path: stacks/ref-implementation
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
    targetRevision: HEAD
  project: default
  syncPolicy:
--- a/template/registry/second-cluster.yaml
+++ b/template/registry/second-cluster.yaml
@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: second-cluster
-  namespace: argocd
-  labels:
-    env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  destination:
-    name: in-cluster
-    namespace: argocd
-  source:
-    path: stacks/second-cluster
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
-    targetRevision: HEAD
-  project: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
--- a/template/stacks/core/argocd-sso.yaml
+++ b/template/stacks/core/argocd-sso.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/core/argocd-sso"
  destination:
--- a/template/stacks/core/argocd.yaml
+++ b/template/stacks/core/argocd.yaml
@ -25,6 +25,6 @@ spec:
      helm:
        valueFiles:
          - $values/stacks/core/argocd/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
--- a/template/stacks/core/forgejo-runner.yaml
+++ b/template/stacks/core/forgejo-runner.yaml
@ -17,6 +17,6 @@ spec:
  destination:
    server: "https://kubernetes.default.svc"
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/core/forgejo-runner"
--- a/template/stacks/core/forgejo-sso.yaml
+++ b/template/stacks/core/forgejo-sso.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/core/forgejo-sso"
  destination:
--- a/template/stacks/core/forgejo.yaml
+++ b/template/stacks/core/forgejo.yaml
@ -22,6 +22,6 @@ spec:
      helm:
        valueFiles:
          - $values/stacks/core/forgejo/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
--- a/template/stacks/core/ingress-apps.yaml
+++ b/template/stacks/core/ingress-apps.yaml
@ -11,7 +11,7 @@ spec:
  destination:
    server: "https://kubernetes.default.svc"
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/core/ingress-apps"
  project: default
--- a/template/stacks/core/ingress-nginx.yaml
+++ b/template/stacks/core/ingress-nginx.yaml
@ -22,6 +22,6 @@ spec:
      helm:
        valueFiles:
          - $values/stacks/core/ingress-nginx/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
--- a/template/stacks/local-backup/minio.yaml
+++ b/template/stacks/local-backup/minio.yaml
@ -10,17 +10,17 @@ metadata:
 spec:
  project: default
  sources:
-    - repoURL: 'https://charts.min.io'
+    - repoURL: "https://charts.min.io"
      targetRevision: 5.0.15
      helm:
        releaseName: minio
        valueFiles:
          - $values/stacks/local-backup/minio/helm/values.yaml
      chart: minio
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      path: "stacks/local-backup/minio/manifests"
  destination:
--- a/template/stacks/local-backup/velero.yaml
+++ b/template/stacks/local-backup/velero.yaml
@ -10,14 +10,14 @@ metadata:
 spec:
  project: default
  sources:
-    - repoURL: 'https://vmware-tanzu.github.io/helm-charts'
+    - repoURL: "https://vmware-tanzu.github.io/helm-charts"
      targetRevision: 8.0.0
      helm:
        releaseName: velero
        valueFiles:
          - $values/stacks/local-backup/velero/helm/values.yaml
      chart: velero
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
  destination:
--- a/template/stacks/monitoring/grafana-dashboards.yaml
+++ b/template/stacks/monitoring/grafana-dashboards.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/monitoring/kube-prometheus/dashboards"
  destination:
--- a/template/stacks/monitoring/kube-prometheus-sso.yaml
+++ b/template/stacks/monitoring/kube-prometheus-sso.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/monitoring/kube-prometheus-sso"
  destination:
--- a/template/stacks/monitoring/kube-prometheus.yaml
+++ b/template/stacks/monitoring/kube-prometheus.yaml
@ -31,6 +31,6 @@ spec:
      helm:
        valueFiles:
          - $values/stacks/monitoring/kube-prometheus/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
--- a/template/stacks/monitoring/loki.yaml
+++ b/template/stacks/monitoring/loki.yaml
@ -24,11 +24,10 @@ spec:
      helm:
        valueFiles:
          - $values/stacks/monitoring/loki/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values

    ## consider using the following version, if it works again
    #- repoURL: https://github.com/grafana/loki
    #  path: production/helm/loki
-
--- a/template/stacks/ref-implementation/argo-workflows.yaml
+++ b/template/stacks/ref-implementation/argo-workflows.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/argo-workflows/manifests/dev"
  destination:
--- a/template/stacks/ref-implementation/backstage-templates.yaml
+++ b/template/stacks/ref-implementation/backstage-templates.yaml
@ -10,11 +10,11 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/backstage-templates/entities"
    directory:
-      exclude: 'catalog-info.yaml'
+      exclude: "catalog-info.yaml"
  destination:
    server: "https://kubernetes.default.svc"
    namespace: backstage
--- a/template/stacks/ref-implementation/backstage.yaml
+++ b/template/stacks/ref-implementation/backstage.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/backstage/manifests"
  destination:
--- a/template/stacks/ref-implementation/backstage/manifests/install.yaml
+++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml
@ -167,7 +167,7 @@ data:
      locations:
        # Examples from a public GitHub repository.
        - type: url
-          target: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml
+          target: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}:443/{{{ .Env.CLIENT_REPO_ORG_NAME }}}/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml
          rules:
            - allow: [Component, System, API, Resource, Location, Template, User, Group]
    kubernetes:
--- a/template/stacks/ref-implementation/external-secrets.yaml
+++ b/template/stacks/ref-implementation/external-secrets.yaml
@ -12,7 +12,7 @@ spec:
    namespace: external-secrets
    server: "https://kubernetes.default.svc"
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/external-secrets/manifests"
  project: default
--- a/template/stacks/ref-implementation/fibonacci-app.yaml
+++ b/template/stacks/ref-implementation/fibonacci-app.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/fibonacci-app"
  destination:
--- a/template/stacks/ref-implementation/keycloak.yaml
+++ b/template/stacks/ref-implementation/keycloak.yaml
@ -12,7 +12,7 @@ spec:
    namespace: keycloak
    server: "https://kubernetes.default.svc"
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/keycloak/manifests"
  project: default
--- a/template/stacks/ref-implementation/mailhog.yaml
+++ b/template/stacks/ref-implementation/mailhog.yaml
@ -10,7 +10,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
    targetRevision: HEAD
    path: "stacks/ref-implementation/mailhog"
  destination:
--- a/template/stacks/ref-implementation/openbao.yaml
+++ b/template/stacks/ref-implementation/openbao.yaml
@ -24,7 +24,7 @@ spec:
      helm:
        valueFiles:
          - $values/stacks/ref-implementation/openbao/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
      targetRevision: HEAD
      ref: values
  ignoreDifferences:
--- a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
+++ b/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
@ -1,23 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: create-new-cluster-guestbook
-  namespace: argocd
-  labels:
-    env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-  destination:
-    name: in-cluster
-    namespace: crossplane-system
-  source:
-    path: stacks/second-cluster/create-new-cluster-guestbook
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
-    targetRevision: HEAD
--- a/template/stacks/second-cluster/create-new-cluster-guestbook/argocluster.yaml
+++ b/template/stacks/second-cluster/create-new-cluster-guestbook/argocluster.yaml
@ -1,16 +0,0 @@
-apiVersion: cluster.argocd.crossplane.io/v1alpha1
-kind: Cluster
-metadata:
-  name: argo-app-test
-  labels:
-    purpose: dev
-spec:
-  forProvider:
-    config:
-      kubeconfigSecretRef:
-        key: kubeconfig
-        namespace: crossplane-system
-        name: argo-app-test-kubeconf
-    name: argo-app-test-cluster
-  providerConfigRef:
-    name: argocd-provider
--- a/template/stacks/second-cluster/create-new-cluster-guestbook/guestbook.yaml
+++ b/template/stacks/second-cluster/create-new-cluster-guestbook/guestbook.yaml
@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: argo-second-cluster-demo
-  namespace: argocd
-spec:
-  destination:
-    namespace: guestbook
-    name: argo-app-test-cluster
-  project: default
-  source:
-    path: guestbook
-    repoURL: https://github.com/argoproj/argocd-example-apps.git
-    targetRevision: HEAD
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
-    retry:
-      limit: -1
-      backoff:
-        duration: 5s 
-        factor: 2 
-        maxDuration: 1m
--- a/template/stacks/second-cluster/create-new-cluster-guestbook/kindcluster.yaml
+++ b/template/stacks/second-cluster/create-new-cluster-guestbook/kindcluster.yaml
@ -1,26 +0,0 @@
-apiVersion: container.kind.crossplane.io/v1alpha1
-kind: KindCluster
-metadata:
-  name: argo-app-test
-spec:
-  forProvider:
-    kindConfig: |
-      kind: Cluster
-      apiVersion: kind.x-k8s.io/v1alpha4
-      nodes:
-      - role: control-plane
-        kubeadmConfigPatches:
-        - |
-          kind: InitConfiguration
-          nodeRegistration:
-            kubeletExtraArgs:
-              node-labels: "ingress-ready=true"
-      # TODO: RIRE used maybe for velero backup
-      #  extraMounts:
-      #    - hostPath: /tmp/backup # replace with your own path
-      #      containerPath: /backup
-  providerConfigRef:
-    name: kind-provider
-  writeConnectionSecretToRef:
-    namespace: crossplane-system
-    name: argo-app-test-kubeconf