From 8c84170ca2f936cb21d6bb842d36f3bec9ce6e89 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Mon, 24 Feb 2025 23:10:05 +0100 Subject: [PATCH] created an own variable for domain gitea --- template/edfbuilder.yaml | 2 +- template/registry/core.yaml | 2 +- template/registry/local-backup.yaml | 2 +- template/registry/monitoring.yaml | 2 +- template/registry/ref-implementation.yaml | 2 +- template/registry/second-cluster.yaml | 2 +- template/stacks/core/argocd.yaml | 2 +- template/stacks/core/crossplane-compositions.yaml | 2 +- template/stacks/core/crossplane-providers.yaml | 2 +- template/stacks/core/forgejo-runner.yaml | 2 +- template/stacks/core/forgejo-runner/dind-docker.yaml | 2 +- template/stacks/core/forgejo.yaml | 2 +- template/stacks/core/forgejo/values.yaml | 4 ++-- template/stacks/core/ingress-apps.yaml | 2 +- template/stacks/core/ingress-apps/forgejo.yaml | 6 +++--- template/stacks/core/ingress-nginx.yaml | 2 +- template/stacks/local-backup/minio.yaml | 4 ++-- template/stacks/local-backup/velero.yaml | 2 +- template/stacks/monitoring/grafana-dashboards.yaml | 2 +- template/stacks/monitoring/kube-prometheus.yaml | 2 +- template/stacks/monitoring/loki.yaml | 2 +- template/stacks/monitoring/promtail.yaml | 2 +- template/stacks/ref-implementation/argo-workflows.yaml | 2 +- .../stacks/ref-implementation/backstage-templates.yaml | 2 +- .../app-with-bucket/skeleton/catalog-info.yaml | 2 +- .../entities/app-with-bucket/template.yaml | 4 ++-- .../entities/argo-workflows/skeleton/catalog-info.yaml | 2 +- .../entities/argo-workflows/template.yaml | 4 ++-- .../entities/basic/skeleton/catalog-info.yaml | 2 +- .../backstage-templates/entities/basic/template.yaml | 4 ++-- .../demo-go-hello-world/skeleton/catalog-info.yaml | 4 ++-- .../entities/demo-go-hello-world/template.yaml | 2 +- .../skeleton/.github/workflows/maven-build.yml | 2 +- .../spring-petclinic/skeleton/catalog-info.yaml | 4 ++-- .../spring-petclinic/skeleton/k8s/petclinic.yml | 2 +- .../entities/spring-petclinic/template.yaml | 4 ++-- template/stacks/ref-implementation/backstage.yaml | 2 +- .../backstage/manifests/install.yaml | 10 +++++----- .../stacks/ref-implementation/external-secrets.yaml | 2 +- template/stacks/ref-implementation/fibonacci-app.yaml | 2 +- template/stacks/ref-implementation/keycloak.yaml | 2 +- template/stacks/ref-implementation/openbao.yaml | 2 +- .../second-cluster/create-new-cluster-guestbook.yaml | 2 +- 43 files changed, 57 insertions(+), 57 deletions(-) diff --git a/template/edfbuilder.yaml b/template/edfbuilder.yaml index 4e9fabd..6afc8c2 100644 --- a/template/edfbuilder.yaml +++ b/template/edfbuilder.yaml @@ -13,7 +13,7 @@ spec: namespace: argocd source: path: registry - repoURL: 'https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder' + repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/core.yaml b/template/registry/core.yaml index 3a722ac..aef343d 100644 --- a/template/registry/core.yaml +++ b/template/registry/core.yaml @@ -13,7 +13,7 @@ spec: namespace: argocd source: path: stacks/core - repoURL: 'https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder' + repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/local-backup.yaml b/template/registry/local-backup.yaml index a2ac46d..5540134 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder' + repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/monitoring.yaml b/template/registry/monitoring.yaml index c9826bc..88b1af3 100644 --- a/template/registry/monitoring.yaml +++ b/template/registry/monitoring.yaml @@ -13,7 +13,7 @@ spec: namespace: argocd source: path: stacks/monitoring - repoURL: 'https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder' + repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/ref-implementation.yaml b/template/registry/ref-implementation.yaml index 3a6cf1a..82bbeaf 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder' + repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/second-cluster.yaml b/template/registry/second-cluster.yaml index 98ddd40..6ff1357 100644 --- a/template/registry/second-cluster.yaml +++ b/template/registry/second-cluster.yaml @@ -13,7 +13,7 @@ spec: namespace: argocd source: path: stacks/second-cluster - repoURL: 'https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder' + repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index a79ef6c..3518102 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -22,6 +22,6 @@ spec: helm: valueFiles: - $values/stacks/core/argocd/values.yaml - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/core/crossplane-compositions.yaml b/template/stacks/core/crossplane-compositions.yaml index f6a6bc0..d5341c8 100644 --- a/template/stacks/core/crossplane-compositions.yaml +++ b/template/stacks/core/crossplane-compositions.yaml @@ -17,7 +17,7 @@ spec: namespace: crossplane-system source: path: stacks/core/crossplane-compositions - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD directory: recurse: true diff --git a/template/stacks/core/crossplane-providers.yaml b/template/stacks/core/crossplane-providers.yaml index 760c33e..3fd69b7 100644 --- a/template/stacks/core/crossplane-providers.yaml +++ b/template/stacks/core/crossplane-providers.yaml @@ -18,6 +18,6 @@ spec: namespace: crossplane-system source: path: stacks/core/crossplane-providers - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD {{{ end }}} diff --git a/template/stacks/core/forgejo-runner.yaml b/template/stacks/core/forgejo-runner.yaml index 1465ba4..edff667 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/core/forgejo-runner" diff --git a/template/stacks/core/forgejo-runner/dind-docker.yaml b/template/stacks/core/forgejo-runner/dind-docker.yaml index 9b56c8a..bad42d5 100644 --- a/template/stacks/core/forgejo-runner/dind-docker.yaml +++ b/template/stacks/core/forgejo-runner/dind-docker.yaml @@ -41,7 +41,7 @@ spec: name: forgejo-runner-token key: token - name: FORGEJO_INSTANCE_URL - value: https://gitea.{{{ .Env.DOMAIN }}} + value: https://{{{ .Env.DOMAIN_GITEA }}} volumeMounts: - name: runner-data mountPath: /data diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml index c8328c0..9b4aeae 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/core/forgejo/values.yaml b/template/stacks/core/forgejo/values.yaml index bfcd384..dda08f7 100644 --- a/template/stacks/core/forgejo/values.yaml +++ b/template/stacks/core/forgejo/values.yaml @@ -25,8 +25,8 @@ gitea: queue: TYPE: level server: - DOMAIN: 'gitea.{{{ .Env.DOMAIN }}}' - ROOT_URL: 'https://gitea.{{{ .Env.DOMAIN }}}:443' + DOMAIN: '{{{ .Env.DOMAIN_GITEA }}}' + ROOT_URL: 'https://{{{ .Env.DOMAIN_GITEA }}}:443' service: ssh: diff --git a/template/stacks/core/ingress-apps.yaml b/template/stacks/core/ingress-apps.yaml index ae66d9f..ec156c5 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/core/ingress-apps" project: default diff --git a/template/stacks/core/ingress-apps/forgejo.yaml b/template/stacks/core/ingress-apps/forgejo.yaml index 3143875..a5657ca 100644 --- a/template/stacks/core/ingress-apps/forgejo.yaml +++ b/template/stacks/core/ingress-apps/forgejo.yaml @@ -6,7 +6,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: 512m {{{ if eq .Env.CLUSTER_TYPE "osc" }}} dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: gitea.{{{ .Env.DOMAIN }}} + dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN_GITEA }}} dns.gardener.cloud/ttl: "600" {{{ end }}} name: forgejo @@ -14,7 +14,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: gitea.{{{ .Env.DOMAIN }}} + - host: {{{ .Env.DOMAIN_GITEA }}} http: paths: - backend: @@ -26,5 +26,5 @@ spec: pathType: Prefix tls: - hosts: - - gitea.{{{ .Env.DOMAIN }}} + - {{{ .Env.DOMAIN_GITEA }}} secretName: forgejo-net-tls diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/core/ingress-nginx.yaml index 4e1f1a8..cb69681 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/local-backup/minio.yaml b/template/stacks/local-backup/minio.yaml index 5163ef0..7de20cd 100644 --- a/template/stacks/local-backup/minio.yaml +++ b/template/stacks/local-backup/minio.yaml @@ -17,10 +17,10 @@ spec: valueFiles: - $values/stacks/local-backup/minio/helm/values.yaml chart: minio - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/local-backup/minio/manifests" destination: diff --git a/template/stacks/local-backup/velero.yaml b/template/stacks/local-backup/velero.yaml index a798f63..e668cf6 100644 --- a/template/stacks/local-backup/velero.yaml +++ b/template/stacks/local-backup/velero.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - $values/stacks/local-backup/velero/helm/values.yaml chart: velero - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values destination: diff --git a/template/stacks/monitoring/grafana-dashboards.yaml b/template/stacks/monitoring/grafana-dashboards.yaml index f27e669..186f692 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/monitoring/kube-prometheus/dashboards" destination: diff --git a/template/stacks/monitoring/kube-prometheus.yaml b/template/stacks/monitoring/kube-prometheus.yaml index f4f6ea5..32cdc88 100644 --- a/template/stacks/monitoring/kube-prometheus.yaml +++ b/template/stacks/monitoring/kube-prometheus.yaml @@ -25,6 +25,6 @@ spec: helm: valueFiles: - $values/stacks/monitoring/kube-prometheus/values.yaml - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/monitoring/loki.yaml b/template/stacks/monitoring/loki.yaml index 8494955..a2f0238 100644 --- a/template/stacks/monitoring/loki.yaml +++ b/template/stacks/monitoring/loki.yaml @@ -24,7 +24,7 @@ spec: helm: valueFiles: - $values/stacks/monitoring/loki/values.yaml - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/monitoring/promtail.yaml b/template/stacks/monitoring/promtail.yaml index bc4682d..8f4af77 100644 --- a/template/stacks/monitoring/promtail.yaml +++ b/template/stacks/monitoring/promtail.yaml @@ -24,6 +24,6 @@ spec: helm: valueFiles: - $values/stacks/monitoring/promtail/values.yaml - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values \ No newline at end of file diff --git a/template/stacks/ref-implementation/argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows.yaml index 93cc7b1..3d33891 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/argo-workflows/manifests/dev" destination: diff --git a/template/stacks/ref-implementation/backstage-templates.yaml b/template/stacks/ref-implementation/backstage-templates.yaml index adb5f08..2749418 100644 --- a/template/stacks/ref-implementation/backstage-templates.yaml +++ b/template/stacks/ref-implementation/backstage-templates.yaml @@ -10,7 +10,7 @@ metadata: spec: project: default source: - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/backstage-templates/entities" directory: diff --git a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml index bc52aa8..dbe0264 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml @@ -20,7 +20,7 @@ metadata: backstage.io/kubernetes-namespace: default argocd/app-name: ${{values.name | dump}} links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Repo URL icon: github spec: diff --git a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml index 34ee8da..fd440d3 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml @@ -100,7 +100,7 @@ spec: input: description: This is an example app # Hard coded value for this demo purposes only. - repoUrl: gitea.{{{ .Env.DOMAIN }}}:443/?repo=${{parameters.name}} + repoUrl: {{{ .Env.DOMAIN_GITEA }}}:443/?repo=${{parameters.name}} defaultBranch: main - id: create-argocd-app name: Create ArgoCD App @@ -111,7 +111,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.{{{ .Env.DOMAIN }}}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/${{parameters.name}} path: "kustomize/base" - id: register name: Register diff --git a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml index 04416ba..ccdf3d0 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml @@ -14,7 +14,7 @@ metadata: apache-spark.cnoe.io/label-selector: env=dev,entity-id=${{values.name}} apache-spark.cnoe.io/cluster-name: local links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Repo URL icon: github spec: diff --git a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml index f6e3083..12c68a3 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml @@ -35,7 +35,7 @@ spec: input: description: This is an example app # Hard coded value for this demo purposes only. - repoUrl: gitea.{{{ .Env.DOMAIN }}}:443/?repo=${{parameters.name}} + repoUrl: {{{ .Env.DOMAIN_GITEA }}}:443/?repo=${{parameters.name}} defaultBranch: main - id: create-argocd-app name: Create ArgoCD App @@ -46,7 +46,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.{{{ .Env.DOMAIN }}}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml index 102ff01..e583206 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml @@ -10,7 +10,7 @@ metadata: backstage.io/kubernetes-namespace: default argocd/app-name: ${{values.name | dump}} links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Repo URL icon: github spec: diff --git a/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml index 7fb96a7..e69d13c 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml @@ -31,7 +31,7 @@ spec: input: description: This is an example app # Hard coded value for this demo purposes only. - repoUrl: gitea.{{{ .Env.DOMAIN }}}:443/?repo=${{parameters.name}} + repoUrl: {{{ .Env.DOMAIN_GITEA }}}:443/?repo=${{parameters.name}} defaultBranch: main - id: create-argocd-app name: Create ArgoCD App @@ -42,7 +42,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.{{{ .Env.DOMAIN }}}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml index f75a37f..07090f2 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml @@ -9,7 +9,7 @@ metadata: backstage.io/kubernetes-label-selector: 'entity-id=${{ values.name }}' backstage.io/kubernetes-namespace: gitea links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Gitea Repo icon: git spec: diff --git a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml index 133e70e..6e9421d 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml @@ -33,7 +33,7 @@ spec: name: Publish to Gitea action: publish:gitea input: - repoUrl: gitea.{{{ .Env.DOMAIN }}}:443/?repo=${{parameters.name}} + repoUrl: {{{ .Env.DOMAIN_GITEA }}}:443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./skeleton defaultBranch: main diff --git a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml index f04cf78..a9058fc 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml +++ b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml @@ -33,7 +33,7 @@ jobs: #run: ./mvnw spring-boot:build-image # the original image build run: | export CONTAINER_REPO=$(echo {% raw %}${{ env.GITHUB_REPOSITORY }}{% endraw %} | tr '[:upper:]' '[:lower:]') - ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage=gitea.{{{ .Env.DOMAIN }}}/${CONTAINER_REPO}:latest -Djib.to.auth.username={% raw %}${{ github.actor }}{% endraw %} -Djib.to.auth.password={% raw %}${{ secrets.PACKAGES_TOKEN }}{% endraw %} + ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage={{{ .Env.DOMAIN_GITEA }}}/${CONTAINER_REPO}:latest -Djib.to.auth.username={% raw %}${{ github.actor }}{% endraw %} -Djib.to.auth.password={% raw %}${{ secrets.PACKAGES_TOKEN }}{% endraw %} - name: Build image as tar run: | ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:buildTar -Djib.allowInsecureRegistries=true diff --git a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml index 94a7880..f9d4b3d 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml @@ -9,7 +9,7 @@ metadata: backstage.io/kubernetes-label-selector: 'entity-id=${{ values.name }}' backstage.io/kubernetes-namespace: gitea links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.{{{ .Env.DOMAIN }}}:443 + - url: https://{{{ .Env.DOMAIN_GITEA }}}:443 title: Gitea Repo icon: git spec: diff --git a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml index 5098ca3..aa6b3d4 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml +++ b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml @@ -58,7 +58,7 @@ spec: spec: containers: - name: workload - image: gitea.{{{ .Env.DOMAIN }}}/giteaadmin/${{ values.name }} + image: {{{ .Env.DOMAIN_GITEA }}}/giteaadmin/${{ values.name }} env: - name: SPRING_PROFILES_ACTIVE value: postgres diff --git a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml index 50afc43..84dc871 100644 --- a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml +++ b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml @@ -50,7 +50,7 @@ spec: name: Publish to Gitea action: publish:gitea input: - repoUrl: gitea.{{{ .Env.DOMAIN }}}:443/?repo=${{parameters.name}} + repoUrl: {{{ .Env.DOMAIN_GITEA }}}:443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./ defaultBranch: main @@ -64,7 +64,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.{{{ .Env.DOMAIN }}}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/${{parameters.name}} path: "k8s" - id: register diff --git a/template/stacks/ref-implementation/backstage.yaml b/template/stacks/ref-implementation/backstage.yaml index f162001..227d29f 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/backstage/manifests" destination: diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index b46fbd4..b3bfd57 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -106,12 +106,12 @@ data: integrations: gitea: - - baseUrl: https://gitea.{{{ .Env.DOMAIN }}}:443 - host: gitea.{{{ .Env.DOMAIN }}}:443 + - baseUrl: https://{{{ .Env.DOMAIN_GITEA }}}:443 + host: {{{ .Env.DOMAIN_GITEA }}}:443 username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - - baseUrl: https://gitea.{{{ .Env.DOMAIN }}} - host: gitea.{{{ .Env.DOMAIN }}} + - baseUrl: https://{{{ .Env.DOMAIN_GITEA }}} + host: {{{ .Env.DOMAIN_GITEA }}} username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - baseUrl: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live @@ -167,7 +167,7 @@ data: locations: # Examples from a public GitHub repository. - type: url - target: https://gitea.{{{ .Env.DOMAIN }}}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml + target: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml rules: - allow: [Component, System, API, Resource, Location, Template, User, Group] kubernetes: diff --git a/template/stacks/ref-implementation/external-secrets.yaml b/template/stacks/ref-implementation/external-secrets.yaml index de2c53a..37e8004 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/external-secrets/manifests" project: default diff --git a/template/stacks/ref-implementation/fibonacci-app.yaml b/template/stacks/ref-implementation/fibonacci-app.yaml index b049686..91b7b2f 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/fibonacci-app" destination: diff --git a/template/stacks/ref-implementation/keycloak.yaml b/template/stacks/ref-implementation/keycloak.yaml index e4fb166..93d8db7 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/keycloak/manifests" project: default diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index a6f3ec8..ffc2923 100644 --- 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://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values ignoreDifferences: diff --git a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml b/template/stacks/second-cluster/create-new-cluster-guestbook.yaml index e71b4f0..26a70eb 100644 --- a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml +++ b/template/stacks/second-cluster/create-new-cluster-guestbook.yaml @@ -19,5 +19,5 @@ spec: namespace: crossplane-system source: path: stacks/second-cluster/create-new-cluster-guestbook - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder targetRevision: HEAD