From c24ab8d976478ba26220745b03f446840d859597 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 8 Dec 2024 22:53:58 +0100 Subject: [PATCH] Using gomplate as hydration template engine --- 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/argocd/values.yaml | 2 +- .../stacks/core/crossplane-compositions.yaml | 2 +- .../stacks/core/crossplane-providers.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-nginx.yaml | 2 +- template/stacks/local-backup/minio.yaml | 4 ++-- template/stacks/local-backup/velero.yaml | 2 +- .../stacks/monitoring/grafana-dashboards.yaml | 2 +- .../stacks/monitoring/kube-prometheus.yaml | 2 +- .../monitoring/kube-prometheus/values.yaml | 2 +- .../kube-prometheus/values_test_osc.yaml | 2 +- template/stacks/monitoring/loki.yaml | 2 +- template/stacks/monitoring/promtail.yaml | 2 +- template/stacks/ref-implementation/README.md | 22 ++++++++--------- .../ref-implementation/argo-workflows.yaml | 2 +- .../dev/patches/cm-argo-workflows.yaml | 4 ++-- .../backstage-templates.yaml | 2 +- .../skeleton/catalog-info.yaml | 2 +- .../entities/app-with-bucket/template.yaml | 4 ++-- .../argo-workflows/skeleton/catalog-info.yaml | 2 +- .../entities/argo-workflows/template.yaml | 4 ++-- .../entities/basic/skeleton/catalog-info.yaml | 2 +- .../entities/basic/template.yaml | 4 ++-- .../skeleton/catalog-info.yaml | 4 ++-- .../demo-go-hello-world/template.yaml | 2 +- .../stacks/ref-implementation/backstage.yaml | 2 +- .../backstage/manifests/install.yaml | 24 +++++++++---------- .../stacks/ref-implementation/codespaces.md | 2 +- .../ref-implementation/external-secrets.yaml | 2 +- .../ref-implementation/fibonacci-app.yaml | 2 +- .../ref-implementation/forgejo-runner.yaml | 2 +- .../stacks/ref-implementation/keycloak.yaml | 2 +- .../keycloak/manifests/install.yaml | 2 +- .../keycloak/manifests/keycloak-config.yaml | 4 ++-- .../stacks/ref-implementation/openbao.yaml | 2 +- .../create-new-cluster-guestbook.yaml | 2 +- 45 files changed, 74 insertions(+), 74 deletions(-) diff --git a/template/edfbuilder.yaml b/template/edfbuilder.yaml index 60d71ea..9b970f1 100644 --- a/template/edfbuilder.yaml +++ b/template/edfbuilder.yaml @@ -13,7 +13,7 @@ spec: namespace: argocd source: path: registry - repoURL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder' + repoURL: 'https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/core.yaml b/template/registry/core.yaml index 1dcd61d..9a5384d 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder' + repoURL: 'https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/local-backup.yaml b/template/registry/local-backup.yaml index dc5cfbe..217ef55 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder' + repoURL: 'https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/monitoring.yaml b/template/registry/monitoring.yaml index c3622f8..dfbb50e 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder' + repoURL: 'https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/ref-implementation.yaml b/template/registry/ref-implementation.yaml index 3ed97c2..828c086 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder' + repoURL: 'https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/registry/second-cluster.yaml b/template/registry/second-cluster.yaml index 9d93dc8..5416cd5 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder' + repoURL: 'https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder' targetRevision: HEAD project: default syncPolicy: diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index aafa998..8d7425a 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/core/argocd/values.yaml b/template/stacks/core/argocd/values.yaml index 9563036..c9231cc 100644 --- a/template/stacks/core/argocd/values.yaml +++ b/template/stacks/core/argocd/values.yaml @@ -1,5 +1,5 @@ global: - domain: {{ .Values.edfbuilderTargetDomain }} + domain: {{]] .Env.DOMAIN [[}} configs: params: diff --git a/template/stacks/core/crossplane-compositions.yaml b/template/stacks/core/crossplane-compositions.yaml index b92effb..b105a31 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD directory: recurse: true diff --git a/template/stacks/core/crossplane-providers.yaml b/template/stacks/core/crossplane-providers.yaml index 1935b8d..7970fef 100644 --- a/template/stacks/core/crossplane-providers.yaml +++ b/template/stacks/core/crossplane-providers.yaml @@ -17,5 +17,5 @@ spec: namespace: crossplane-system source: path: stacks/core/crossplane-providers - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml index fdc5792..6b73bc1 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/core/forgejo/values.yaml b/template/stacks/core/forgejo/values.yaml index 243ca82..5baa85d 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.{{ .Values.edfbuilderTargetDomain }}' - ROOT_URL: 'https://gitea.{{ .Values.edfbuilderTargetDomain }}:443' + DOMAIN: 'gitea.{{]] .Env.DOMAIN [[}}' + ROOT_URL: 'https://gitea.{{]] .Env.DOMAIN [[}}:443' service: ssh: diff --git a/template/stacks/core/ingress-apps.yaml b/template/stacks/core/ingress-apps.yaml index 7b6b125..4c07d83 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/core/ingress-apps" project: default diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/core/ingress-nginx.yaml index 0774a2c..ac1a8b3 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/local-backup/minio.yaml b/template/stacks/local-backup/minio.yaml index cd23156..5ec2f32 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values - - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/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 4a818ab..a6fb44c 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values destination: diff --git a/template/stacks/monitoring/grafana-dashboards.yaml b/template/stacks/monitoring/grafana-dashboards.yaml index 8a4b7be..00b66d8 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/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 2dac1f1..fca9e3e 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index bd4be29..f183e88 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -30,6 +30,6 @@ grafana: grafana.ini: server: - domain: {{ .Values.edfbuilderTargetDomain }} + domain: {{]] .Env.DOMAIN [[}} root_url: "%(protocol)s://%(domain)s/grafana" serve_from_sub_path: true \ No newline at end of file diff --git a/template/stacks/monitoring/kube-prometheus/values_test_osc.yaml b/template/stacks/monitoring/kube-prometheus/values_test_osc.yaml index 55c0451..cf32ce4 100644 --- a/template/stacks/monitoring/kube-prometheus/values_test_osc.yaml +++ b/template/stacks/monitoring/kube-prometheus/values_test_osc.yaml @@ -11,5 +11,5 @@ grafana: enabled: true ingressClassName: nginx hosts: - - {{ .Values.edfbuilderTargetDomain }} + - {{]] .Env.DOMAIN [[}} path: /grafana \ No newline at end of file diff --git a/template/stacks/monitoring/loki.yaml b/template/stacks/monitoring/loki.yaml index 10e254f..7c5b6dd 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/monitoring/promtail.yaml b/template/stacks/monitoring/promtail.yaml index 279ee88..c9a00cf 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values \ No newline at end of file diff --git a/template/stacks/ref-implementation/README.md b/template/stacks/ref-implementation/README.md index acb945b..b6e1d35 100644 --- a/template/stacks/ref-implementation/README.md +++ b/template/stacks/ref-implementation/README.md @@ -30,7 +30,7 @@ idpbuilder create --use-path-routing \ --package https://github.com/cnoe-io/stacks//ref-implementation ``` -This will take ~6 minutes for everything to come up. To track the progress, you can go to the [ArgoCD UI](https://{{ .Values.edfbuilderTargetDomain }}:8443/argocd/applications). +This will take ~6 minutes for everything to come up. To track the progress, you can go to the [ArgoCD UI](https://{{]] .Env.DOMAIN [[}}:8443/argocd/applications). ### What was installed? @@ -47,15 +47,15 @@ The only package that cannot be removed this way is Keycloak because other packa #### Accessing UIs -- Argo CD: https://{{ .Values.edfbuilderTargetDomain }}:8443/argocd -- Argo Workflows: https://{{ .Values.edfbuilderTargetDomain }}:8443/argo-workflows -- Backstage: https://{{ .Values.edfbuilderTargetDomain }}:8443/ -- Gitea: https://{{ .Values.edfbuilderTargetDomain }}:8443/gitea -- Keycloak: https://{{ .Values.edfbuilderTargetDomain }}:8443/keycloak/admin/master/console/ +- Argo CD: https://{{]] .Env.DOMAIN [[}}:8443/argocd +- Argo Workflows: https://{{]] .Env.DOMAIN [[}}:8443/argo-workflows +- Backstage: https://{{]] .Env.DOMAIN [[}}:8443/ +- Gitea: https://{{]] .Env.DOMAIN [[}}:8443/gitea +- Keycloak: https://{{]] .Env.DOMAIN [[}}:8443/keycloak/admin/master/console/ # Using it -For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://{{ .Values.edfbuilderTargetDomain }}:8443). +For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://{{]] .Env.DOMAIN [[}}:8443). Click on the Sign-In button, you will be asked to log into the Keycloak instance. There are two users set up in this configuration, and their password can be retrieved with the following command: @@ -70,7 +70,7 @@ Both users use the same password retrieved above. If you want to create a new user or change existing users: -1. Go to the [Keycloak UI](https://{{ .Values.edfbuilderTargetDomain }}:8443/keycloak/admin/master/console/). +1. Go to the [Keycloak UI](https://{{]] .Env.DOMAIN [[}}:8443/keycloak/admin/master/console/). Login with the username `cnoe-admin`. Password is the `KEYCLOAK_ADMIN_PASSWORD` field from the command above. 2. Select `cnoe` from the realms drop down menu. 3. Select users tab. @@ -97,9 +97,9 @@ You can click on the ArgoCD Application name to see more details. ### What just happened? -1. Backstage created [a git repository](https://{{ .Values.edfbuilderTargetDomain }}:8443/gitea/giteaAdmin/demo), then pushed templated contents to it. -2. Backstage created [an ArgoCD Application](https://{{ .Values.edfbuilderTargetDomain }}:8443/argocd/applications/argocd/demo?) and pointed it to the git repository. -3. Backstage registered the application as [a component](https://{{ .Values.edfbuilderTargetDomain }}:8443/gitea/giteaAdmin/demo/src/branch/main/catalog-info.yaml) in Backstage. +1. Backstage created [a git repository](https://{{]] .Env.DOMAIN [[}}:8443/gitea/giteaAdmin/demo), then pushed templated contents to it. +2. Backstage created [an ArgoCD Application](https://{{]] .Env.DOMAIN [[}}:8443/argocd/applications/argocd/demo?) and pointed it to the git repository. +3. Backstage registered the application as [a component](https://{{]] .Env.DOMAIN [[}}:8443/gitea/giteaAdmin/demo/src/branch/main/catalog-info.yaml) in Backstage. 4. ArgoCD deployed the manifests stored in the repo to the cluster. 5. Backstage retrieved application health from ArgoCD API, then displayed it. diff --git a/template/stacks/ref-implementation/argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows.yaml index a5794b0..43928d0 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/argo-workflows/manifests/dev" destination: diff --git a/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml index 29bb00b..3f2d5cb 100644 --- a/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml +++ b/template/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml @@ -7,14 +7,14 @@ data: config: | sso: insecureSkipVerify: true - issuer: https://{{ .Values.edfbuilderTargetDomain }}/keycloak/realms/cnoe + issuer: https://{{]] .Env.DOMAIN [[}}/keycloak/realms/cnoe clientId: name: keycloak-oidc key: client-id clientSecret: name: keycloak-oidc key: secret-key - redirectUrl: https://{{ .Values.edfbuilderTargetDomain }}:443/argo-workflows/oauth2/callback + redirectUrl: https://{{]] .Env.DOMAIN [[}}:443/argo-workflows/oauth2/callback rbac: enabled: true scopes: diff --git a/template/stacks/ref-implementation/backstage-templates.yaml b/template/stacks/ref-implementation/backstage-templates.yaml index 8083351..a635a7f 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/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 3cbbf60..2e2b83f 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.{{ .Values.edfbuilderTargetDomain }}:443 + - url: https://gitea.{{]] .Env.DOMAIN [[}}: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 7c042f5..96364c6 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.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}} + repoUrl: gitea.{{]] .Env.DOMAIN [[}}: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.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.{{]] .Env.DOMAIN [[}}: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 5f358e6..663722d 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.{{ .Values.edfbuilderTargetDomain }}:443 + - url: https://gitea.{{]] .Env.DOMAIN [[}}: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 fb3934a..2a0a2d3 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.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}} + repoUrl: gitea.{{]] .Env.DOMAIN [[}}: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.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.{{]] .Env.DOMAIN [[}}: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 2444abd..39c3c20 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.{{ .Values.edfbuilderTargetDomain }}:443 + - url: https://gitea.{{]] .Env.DOMAIN [[}}: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 ee2a472..0f44d97 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.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}} + repoUrl: gitea.{{]] .Env.DOMAIN [[}}: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.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.{{]] .Env.DOMAIN [[}}: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 e476c6e..a67e735 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.{{ .Values.edfbuilderTargetDomain }}:443 + - url: https://gitea.{{]] .Env.DOMAIN [[}}:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443 + - url: https://gitea.{{]] .Env.DOMAIN [[}}: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 956e0b5..ef929c8 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.{{ .Values.edfbuilderTargetDomain }}:443/?repo=${{parameters.name}} + repoUrl: gitea.{{]] .Env.DOMAIN [[}}:443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./skeleton defaultBranch: main diff --git a/template/stacks/ref-implementation/backstage.yaml b/template/stacks/ref-implementation/backstage.yaml index b4cc1a3..c31ab31 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/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 57124f2..c234da3 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -70,7 +70,7 @@ data: app-config.yaml: | app: title: CNOE Backstage - baseUrl: https://{{ .Values.edfbuilderTargetDomain }}:443 + baseUrl: https://{{]] .Env.DOMAIN [[}}:443 organization: name: CNOE backend: @@ -80,7 +80,7 @@ data: # auth: # keys: # - secret: ${BACKEND_SECRET} - baseUrl: https://{{ .Values.edfbuilderTargetDomain }}:443 + baseUrl: https://{{]] .Env.DOMAIN [[}}:443 listen: port: 7007 # Uncomment the following host directive to bind to specific interfaces @@ -90,7 +90,7 @@ data: # Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference # Default Helmet Content-Security-Policy values can be removed by setting the key to false cors: - origin: https://{{ .Values.edfbuilderTargetDomain }}:443 + origin: https://{{]] .Env.DOMAIN [[}}:443 methods: [GET, HEAD, PATCH, POST, PUT, DELETE] credentials: true database: @@ -106,12 +106,12 @@ data: integrations: gitea: - - baseUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443 - host: gitea.{{ .Values.edfbuilderTargetDomain }}:443 + - baseUrl: https://gitea.{{]] .Env.DOMAIN [[}}:443 + host: gitea.{{]] .Env.DOMAIN [[}}:443 username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - - baseUrl: https://gitea.{{ .Values.edfbuilderTargetDomain }} - host: gitea.{{ .Values.edfbuilderTargetDomain }} + - baseUrl: https://gitea.{{]] .Env.DOMAIN [[}} + host: gitea.{{]] .Env.DOMAIN [[}} username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} # github: @@ -165,7 +165,7 @@ data: locations: # Examples from a public GitHub repository. - type: url - target: https://gitea.{{ .Values.edfbuilderTargetDomain }}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml + target: https://gitea.{{]] .Env.DOMAIN [[}}: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: @@ -180,7 +180,7 @@ data: - type: 'config' instances: - name: in-cluster - url: https://{{ .Values.edfbuilderTargetDomain }}:443/argocd + url: https://{{]] .Env.DOMAIN [[}}:443/argocd username: admin password: ${ARGOCD_ADMIN_PASSWORD} argoWorkflows: @@ -374,14 +374,14 @@ spec: template: engineVersion: v2 data: - BACKSTAGE_FRONTEND_URL: https://{{ .Values.edfbuilderTargetDomain }}:443/backstage + BACKSTAGE_FRONTEND_URL: https://{{]] .Env.DOMAIN [[}}:443/backstage POSTGRES_HOST: postgresql.backstage.svc.cluster.local POSTGRES_PORT: '5432' POSTGRES_DB: backstage POSTGRES_USER: backstage POSTGRES_PASSWORD: "{{.POSTGRES_PASSWORD}}" - ARGO_WORKFLOWS_URL: https://{{ .Values.edfbuilderTargetDomain }}:443/argo-workflows - KEYCLOAK_NAME_METADATA: https://{{ .Values.edfbuilderTargetDomain }}:443/keycloak/realms/cnoe/.well-known/openid-configuration + ARGO_WORKFLOWS_URL: https://{{]] .Env.DOMAIN [[}}:443/argo-workflows + KEYCLOAK_NAME_METADATA: https://{{]] .Env.DOMAIN [[}}:443/keycloak/realms/cnoe/.well-known/openid-configuration KEYCLOAK_CLIENT_SECRET: "{{.BACKSTAGE_CLIENT_SECRET}}" ARGOCD_AUTH_TOKEN: "argocd.token={{.ARGOCD_SESSION_TOKEN}}" ARGO_CD_URL: 'https://argocd-server.argocd.svc.cluster.local/api/v1/' diff --git a/template/stacks/ref-implementation/codespaces.md b/template/stacks/ref-implementation/codespaces.md index 37144ae..d0ff7af 100644 --- a/template/stacks/ref-implementation/codespaces.md +++ b/template/stacks/ref-implementation/codespaces.md @@ -69,5 +69,5 @@ From here on, you can follow the instructions in the [README](./README.md) file. echo https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN} ``` -For example, if you need to access Argo Workflows UI, instead of going to `https://{{ .Values.edfbuilderTargetDomain }}:8443/argo`, +For example, if you need to access Argo Workflows UI, instead of going to `https://{{]] .Env.DOMAIN [[}}:8443/argo`, you go to `https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/argo` diff --git a/template/stacks/ref-implementation/external-secrets.yaml b/template/stacks/ref-implementation/external-secrets.yaml index fdea39f..d8856f6 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/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 bd5c94a..ca006d3 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/fibonacci-app" destination: diff --git a/template/stacks/ref-implementation/forgejo-runner.yaml b/template/stacks/ref-implementation/forgejo-runner.yaml index c2dee0f..0f2a821 100644 --- a/template/stacks/ref-implementation/forgejo-runner.yaml +++ b/template/stacks/ref-implementation/forgejo-runner.yaml @@ -24,6 +24,6 @@ spec: helm: valueFiles: - $values/stacks/ref-implementation/forgejo-runner/values.yaml - - repoURL: https://gitea.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD ref: values diff --git a/template/stacks/ref-implementation/keycloak.yaml b/template/stacks/ref-implementation/keycloak.yaml index 32bee77..52a7221 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD path: "stacks/ref-implementation/keycloak/manifests" project: default diff --git a/template/stacks/ref-implementation/keycloak/manifests/install.yaml b/template/stacks/ref-implementation/keycloak/manifests/install.yaml index 4d01c35..3cd7600 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/install.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/install.yaml @@ -83,7 +83,7 @@ data: proxy=edge # hostname configuration - hostname={{ .Values.edfbuilderTargetDomain }} + hostname={{]] .Env.DOMAIN [[}} http-relative-path=keycloak # the admin url requires its own configuration to reflect correct url diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index e48960e..4af40bb 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -145,7 +145,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://{{ .Values.edfbuilderTargetDomain }}:443/argo-workflows/oauth2/callback" + "https://{{]] .Env.DOMAIN [[}}:443/argo-workflows/oauth2/callback" ], "webOrigins": [ "/*" @@ -174,7 +174,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://{{ .Values.edfbuilderTargetDomain }}:443/api/auth/keycloak-oidc/handler/frame" + "https://{{]] .Env.DOMAIN [[}}:443/api/auth/keycloak-oidc/handler/frame" ], "webOrigins": [ "/*" diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml index b378351..e392908 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + - repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/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 d8d167c..d0325e0 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.{{ .Values.edfbuilderTargetDomain }}/giteaAdmin/edfbuilder + repoURL: https://gitea.{{]] .Env.DOMAIN [[}}/giteaAdmin/edfbuilder targetRevision: HEAD