From 03768e8399779f8264281cbf278ea33e872e2dd6 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Thu, 6 Feb 2025 20:54:18 +0100 Subject: [PATCH 01/31] Updated the forgejo-runner --- .../ref-implementation/forgejo-runner/values.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/template/stacks/ref-implementation/forgejo-runner/values.yaml b/template/stacks/ref-implementation/forgejo-runner/values.yaml index 7789e35..2fdc97c 100644 --- a/template/stacks/ref-implementation/forgejo-runner/values.yaml +++ b/template/stacks/ref-implementation/forgejo-runner/values.yaml @@ -1,14 +1,8 @@ -replicaCount: 1 +replicaCount: 2 image: repository: code.forgejo.org/forgejo/runner pullPolicy: IfNotPresent - tag: "3.5.1" - -resources: - limits: - memory: 2Gi - requests: - memory: 1Gi + tag: "6.0.1" forgejoUrl: http://forgejo-http.gitea.svc.cluster.local:3000 From cc34792edb248519e45e3d79427a7df858db5895 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 21 Feb 2025 21:24:29 +0000 Subject: [PATCH 02/31] Update template/stacks/ref-implementation/forgejo-runner/values.yaml --- template/stacks/ref-implementation/forgejo-runner/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/forgejo-runner/values.yaml b/template/stacks/ref-implementation/forgejo-runner/values.yaml index 2fdc97c..ab419b0 100644 --- a/template/stacks/ref-implementation/forgejo-runner/values.yaml +++ b/template/stacks/ref-implementation/forgejo-runner/values.yaml @@ -1,4 +1,4 @@ -replicaCount: 2 +replicaCount: 1 image: repository: code.forgejo.org/forgejo/runner From 394dc9f400c3bafb7c1c5c93ed0b4df112fe673f Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 23 Feb 2025 11:09:12 +0100 Subject: [PATCH 03/31] Activated DinD in forgejo-runner --- template/stacks/core/forgejo-runner.yaml | 22 +++++ .../core/forgejo-runner/dind-docker.yaml | 94 +++++++++++++++++++ .../ref-implementation/forgejo-runner.yaml | 29 ------ .../forgejo-runner/values.yaml | 8 -- 4 files changed, 116 insertions(+), 37 deletions(-) create mode 100644 template/stacks/core/forgejo-runner.yaml create mode 100644 template/stacks/core/forgejo-runner/dind-docker.yaml delete mode 100644 template/stacks/ref-implementation/forgejo-runner.yaml delete mode 100644 template/stacks/ref-implementation/forgejo-runner/values.yaml diff --git a/template/stacks/core/forgejo-runner.yaml b/template/stacks/core/forgejo-runner.yaml new file mode 100644 index 0000000..1465ba4 --- /dev/null +++ b/template/stacks/core/forgejo-runner.yaml @@ -0,0 +1,22 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: forgejo-runner + namespace: argocd + labels: + env: dev + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + syncPolicy: + automated: + selfHeal: true + syncOptions: + - CreateNamespace=true + destination: + server: "https://kubernetes.default.svc" + source: + repoURL: https://gitea.{{{ .Env.DOMAIN }}}/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 new file mode 100644 index 0000000..ad08fd0 --- /dev/null +++ b/template/stacks/core/forgejo-runner/dind-docker.yaml @@ -0,0 +1,94 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: forgejo-runner + name: forgejo-runner + namespace: gitea +spec: + # Two replicas means that if one is busy, the other can pick up jobs. + replicas: 1 + selector: + matchLabels: + app: forgejo-runner + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: forgejo-runner + spec: + restartPolicy: Always + volumes: + - name: docker-certs + emptyDir: {} + - name: runner-data + emptyDir: {} + # Initialise our configuration file using offline registration + # https://forgejo.org/docs/v1.21/admin/actions/#offline-registration + initContainers: + - name: runner-register + image: code.forgejo.org/forgejo/runner:6.0.1 + command: ["forgejo-runner", "register", "--no-interactive", "--token", $(RUNNER_SECRET), "--name", $(RUNNER_NAME), "--instance", $(FORGEJO_INSTANCE_URL), "--labels", "docker:docker://node:20-bookworm,ubuntu-22.04:docker://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/catthehackerubuntu:act-22.04"] + env: + - name: RUNNER_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: RUNNER_SECRET + valueFrom: + secretKeyRef: + name: forgejo-runner-token + key: token + - name: FORGEJO_INSTANCE_URL + value: http://forgejo-http.gitea.svc.cluster.local:3000 + volumeMounts: + - name: runner-data + mountPath: /data + containers: + - name: runner + image: code.forgejo.org/forgejo/runner:6.0.1 + command: + - "sh" + - "-c" + - | + while ! nc -z 127.0.0.1 2376 config.yml ; + sed -i -e "s|privileged: .*|privileged: true|" config.yml + sed -i -e "s|network: .*|network: host|" config.yml ; + sed -i -e "s|^ envs:$$| envs:\n DOCKER_HOST: tcp://127.0.0.1:2376\n DOCKER_TLS_VERIFY: 1\n DOCKER_CERT_PATH: /certs/client|" config.yml ; + sed -i -e "s|^ options:| options: -v /certs/client:/certs/client|" config.yml ; + sed -i -e "s| valid_volumes: \[\]$$| valid_volumes:\n - /certs/client|" config.yml ; + /bin/forgejo-runner --config config.yml daemon + securityContext: + allowPrivilegeEscalation: true + privileged: true + readOnlyRootFilesystem: false + runAsGroup: 0 + runAsNonRoot: false + runAsUser: 0 + env: + - name: DOCKER_HOST + value: tcp://localhost:2376 + - name: DOCKER_CERT_PATH + value: /certs/client + - name: DOCKER_TLS_VERIFY + value: "1" + volumeMounts: + - name: docker-certs + mountPath: /certs + - name: runner-data + mountPath: /data + - name: daemon + image: docker:27.4.1-dind + env: + - name: DOCKER_TLS_CERTDIR + value: /certs + securityContext: + privileged: true + volumeMounts: + - name: docker-certs + mountPath: /certs diff --git a/template/stacks/ref-implementation/forgejo-runner.yaml b/template/stacks/ref-implementation/forgejo-runner.yaml deleted file mode 100644 index bceefc7..0000000 --- a/template/stacks/ref-implementation/forgejo-runner.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: forgejo-runner - 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: gitea - sources: - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/forgejo-runner.git - path: forgejo-runner - targetRevision: HEAD - helm: - valueFiles: - - $values/stacks/ref-implementation/forgejo-runner/values.yaml - - repoURL: https://gitea.{{{ .Env.DOMAIN }}}/giteaAdmin/edfbuilder - targetRevision: HEAD - ref: values diff --git a/template/stacks/ref-implementation/forgejo-runner/values.yaml b/template/stacks/ref-implementation/forgejo-runner/values.yaml deleted file mode 100644 index ab419b0..0000000 --- a/template/stacks/ref-implementation/forgejo-runner/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ -replicaCount: 1 - -image: - repository: code.forgejo.org/forgejo/runner - pullPolicy: IfNotPresent - tag: "6.0.1" - -forgejoUrl: http://forgejo-http.gitea.svc.cluster.local:3000 From e3f1899983d95dbf1e40b7aa75e08fc3681ba69e Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 23 Feb 2025 15:36:13 +0100 Subject: [PATCH 04/31] Fixed forgejo url in runner --- template/stacks/core/forgejo-runner/dind-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/forgejo-runner/dind-docker.yaml b/template/stacks/core/forgejo-runner/dind-docker.yaml index ad08fd0..9b56c8a 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: http://forgejo-http.gitea.svc.cluster.local:3000 + value: https://gitea.{{{ .Env.DOMAIN }}} volumeMounts: - name: runner-data mountPath: /data From 8c84170ca2f936cb21d6bb842d36f3bec9ce6e89 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Mon, 24 Feb 2025 23:10:05 +0100 Subject: [PATCH 05/31] 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 From 265af3acfffbb8d2eae666b991db87b0d24fdadb Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 28 Feb 2025 11:01:07 +0000 Subject: [PATCH 06/31] Update template/stacks/core/argocd.yaml --- template/stacks/core/argocd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index 3518102..cd2a34b 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -18,7 +18,7 @@ spec: sources: - repoURL: https://github.com/argoproj/argo-helm path: charts/argo-cd - targetRevision: argo-cd-7.7.5 + targetRevision: argo-cd-7.6.12 helm: valueFiles: - $values/stacks/core/argocd/values.yaml From 9cc9b864a2e4bef9421efd62ed4434877faa6cc9 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 28 Feb 2025 11:04:21 +0000 Subject: [PATCH 07/31] Update template/stacks/core/argocd.yaml --- template/stacks/core/argocd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index cd2a34b..15cb6fb 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -18,6 +18,7 @@ spec: sources: - repoURL: https://github.com/argoproj/argo-helm path: charts/argo-cd + # TOD: RIRE targetRevision: argo-cd-7.6.12 helm: valueFiles: From 168286cfce1688a280cca8ed9fdedcc4a1f2840a Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 28 Feb 2025 11:07:21 +0000 Subject: [PATCH 08/31] Update template/stacks/core/argocd.yaml --- template/stacks/core/argocd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index 15cb6fb..215d1e3 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -18,7 +18,7 @@ spec: sources: - repoURL: https://github.com/argoproj/argo-helm path: charts/argo-cd - # TOD: RIRE + # TOD: RIRE can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged targetRevision: argo-cd-7.6.12 helm: valueFiles: From 90168312862e39fe4e3c7026e9cf20a2bc98b51f Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 28 Feb 2025 11:15:56 +0000 Subject: [PATCH 09/31] Update template/stacks/core/argocd.yaml --- template/stacks/core/argocd.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index 215d1e3..4433721 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -18,7 +18,9 @@ spec: sources: - repoURL: https://github.com/argoproj/argo-helm path: charts/argo-cd - # TOD: RIRE can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged + # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged + # As logout make problems, it is suggested to switch from path based routing to an own argocd domain, + # similar to the CNOE amazon reference implementation and in our case, Forgejo targetRevision: argo-cd-7.6.12 helm: valueFiles: From 88d599a69109dc026ac0fe284fef85f89a9a0519 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 28 Feb 2025 13:30:29 +0000 Subject: [PATCH 10/31] Update template/stacks/monitoring/kube-prometheus/values.yaml --- .../monitoring/kube-prometheus/values.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 9c0ca32..942f6a6 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -33,6 +33,26 @@ grafana: domain: {{{ .Env.DOMAIN }}} root_url: "%(protocol)s://%(domain)s/grafana" serve_from_sub_path: true + auth: + oauth_allow_insecure_email_lookup: true + disable_login: true + disable_login_form: true + auth.generic_oauth: + enabled: true + name: Keycloak-OAuth + allow_sign_up: true + client_id: grafana-oauth + #client_secret: todo need to be set elsewhere + scopes: openid email profile offline_access roles + email_attribute_path: email + login_attribute_path: username + name_attribute_path: full_name + tls_skip_verify_insecure: true + auth_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/auth + token_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/token + api_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/userinfo + redirect_uri: http://{{{ .Env.DOMAIN }}}/grafana/login/generic_oauth + role_attribute_path: contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer' serviceMonitor: # If true, a ServiceMonitor CRD is created for a prometheus operator https://github.com/coreos/prometheus-operator From 0f8282ead68f085dd4c47416333c7335175dd1b6 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 28 Feb 2025 14:08:07 +0000 Subject: [PATCH 11/31] Update template/stacks/monitoring/kube-prometheus/values.yaml --- .../monitoring/kube-prometheus/values.yaml | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 942f6a6..22ffb4c 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -30,7 +30,7 @@ grafana: grafana.ini: server: - domain: {{{ .Env.DOMAIN }}} + domain: factory-172-18-0-2.traefik.me root_url: "%(protocol)s://%(domain)s/grafana" serve_from_sub_path: true auth: @@ -41,19 +41,26 @@ grafana: enabled: true name: Keycloak-OAuth allow_sign_up: true - client_id: grafana-oauth - #client_secret: todo need to be set elsewhere + client_id: $__file{/etc/secrets/auth_generic_oauth/client_id} + client_secret: $__file{/etc/secrets/auth_generic_oauth/client_secret} scopes: openid email profile offline_access roles email_attribute_path: email login_attribute_path: username name_attribute_path: full_name tls_skip_verify_insecure: true - auth_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/auth - token_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/token - api_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/userinfo - redirect_uri: http://{{{ .Env.DOMAIN }}}/grafana/login/generic_oauth + auth_url: https://factory-172-18-0-2.traefik.me/keycloak/realms/cnoe/protocol/openid-connect/auth + token_url: https://factory-172-18-0-2.traefik.me/keycloak/realms/cnoe/protocol/openid-connect/token + api_url: https://factory-172-18-0-2.traefik.me/keycloak/realms/cnoe/protocol/openid-connect/userinfo + redirect_uri: http://factory-172-18-0-2.traefik.me/grafana/login/generic_oauth role_attribute_path: contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer' + extraSecretMounts: + - name: auth-generic-oauth-secret-mount + secretName: auth-generic-oauth-secret + defaultMode: 0440 + mountPath: /etc/secrets/auth_generic_oauth + readOnly: true + serviceMonitor: # If true, a ServiceMonitor CRD is created for a prometheus operator https://github.com/coreos/prometheus-operator enabled: true From ce6c51eea97f94d27109a1774585347c9425f39d Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 10:47:25 +0100 Subject: [PATCH 12/31] Enhanced grafana yaml --- .../stacks/monitoring/kube-prometheus/values.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 22ffb4c..c0754b6 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -30,11 +30,10 @@ grafana: grafana.ini: server: - domain: factory-172-18-0-2.traefik.me + domain: {{{ .Env.DOMAIN }}} root_url: "%(protocol)s://%(domain)s/grafana" serve_from_sub_path: true auth: - oauth_allow_insecure_email_lookup: true disable_login: true disable_login_form: true auth.generic_oauth: @@ -47,12 +46,11 @@ grafana: email_attribute_path: email login_attribute_path: username name_attribute_path: full_name - tls_skip_verify_insecure: true - auth_url: https://factory-172-18-0-2.traefik.me/keycloak/realms/cnoe/protocol/openid-connect/auth - token_url: https://factory-172-18-0-2.traefik.me/keycloak/realms/cnoe/protocol/openid-connect/token - api_url: https://factory-172-18-0-2.traefik.me/keycloak/realms/cnoe/protocol/openid-connect/userinfo - redirect_uri: http://factory-172-18-0-2.traefik.me/grafana/login/generic_oauth - role_attribute_path: contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer' + auth_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/auth + token_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/token + api_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/userinfo + redirect_uri: http://{{{ .Env.DOMAIN }}}/grafana/login/generic_oauth + role_attribute_path: "contains(resource_access.\"grafana-oauth\".roles[*], 'admin') && 'Admin' || contains(resource_access.\"grafana-oauth\".roles[*], 'editor') && 'Editor' || 'Viewer'" extraSecretMounts: - name: auth-generic-oauth-secret-mount From 65c5321ce687d78ab6c8f774c4e3d2b1b12838d9 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 13:11:38 +0100 Subject: [PATCH 13/31] Added Grafana client config to Keycloak --- .../keycloak/manifests/keycloak-config.yaml | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index e2a0981..2dd6d9b 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -181,6 +181,82 @@ data: ] } + grafana-client-payload.json: | + { + "clientId": "grafana-oauth", + "name": "grafana-oauth", + "description": "Used for Grafana SSO", + "rootUrl": "https://{{{ .Env.DOMAIN }}}/grafana", + "adminUrl": "https://{{{ .Env.DOMAIN }}}/grafana", + "baseUrl": "https://{{{ .Env.DOMAIN }}}/grafana", + "surrogateAuthRequired": false, + "enabled": true, + "alwaysDisplayInConsole": false, + "clientAuthenticatorType": "client-secret", + "secret": "aQ1UV9Z6ZuLBwrgw8vV9ijf6LA95yMZL", + "redirectUris": [ + "http://{{{ .Env.DOMAIN }}}/grafana/*" + ], + "webOrigins": [ + "https://{{{ .Env.DOMAIN }}}/grafana" + ], + "notBefore": 0, + "bearerOnly": false, + "consentRequired": false, + "standardFlowEnabled": true, + "implicitFlowEnabled": false, + "directAccessGrantsEnabled": true, + "serviceAccountsEnabled": false, + "publicClient": false, + "frontchannelLogout": true, + "protocol": "openid-connect", + "attributes": { + "oidc.ciba.grant.enabled": "false", + "backchannel.logout.session.required": "true", + "display.on.consent.screen": "false", + "oauth2.device.authorization.grant.enabled": "false", + "backchannel.logout.revoke.offline.tokens": "false" + }, + "authenticationFlowBindingOverrides": {}, + "fullScopeAllowed": true, + "nodeReRegistrationTimeout": -1, + "protocolMappers": [ + { + "name": "client roles", + "protocol": "openid-connect", + "protocolMapper": "oidc-usermodel-client-role-mapper", + "consentRequired": false, + "config": { + "multivalued": "true", + "userinfo.token.claim": "false", + "user.attribute": "foo", + "id.token.claim": "true", + "access.token.claim": "true", + "claim.name": "resource_access.${client_id}.roles", + "jsonType.label": "String" + } + } + ], + "defaultClientScopes": [ + "web-origins", + "acr", + "roles", + "offline_access", + "profile", + "email" + ], + "optionalClientScopes": [ + "address", + "phone", + "microprofile-jwt" + ], + "access": { + "view": true, + "configure": true, + "manage": true + } + } + --- apiVersion: batch/v1 kind: Job From efa3a6e4dceb74b3eb9321d59492cdddf3fe9c7c Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 13:18:04 +0100 Subject: [PATCH 14/31] Added ArgoCD sync retry to Grafana --- template/stacks/monitoring/kube-prometheus.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/stacks/monitoring/kube-prometheus.yaml b/template/stacks/monitoring/kube-prometheus.yaml index 32cdc88..1f5218c 100644 --- a/template/stacks/monitoring/kube-prometheus.yaml +++ b/template/stacks/monitoring/kube-prometheus.yaml @@ -15,6 +15,8 @@ spec: syncOptions: - CreateNamespace=true - ServerSideApply=true # do not copy metdata, since (because of its large size) it can lead to sync failure + retry: + limit: -1 destination: name: in-cluster namespace: monitoring From e02d4bb272b1df68e4fa5e4171d0dfbf5d77edf4 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 13:27:51 +0100 Subject: [PATCH 15/31] Added more Grafana client config to Keycloak --- .../keycloak/manifests/keycloak-config.yaml | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 2dd6d9b..d071f9a 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -183,8 +183,8 @@ data: grafana-client-payload.json: | { - "clientId": "grafana-oauth", - "name": "grafana-oauth", + "clientId": "grafana", + "name": "Grafana Client", "description": "Used for Grafana SSO", "rootUrl": "https://{{{ .Env.DOMAIN }}}/grafana", "adminUrl": "https://{{{ .Env.DOMAIN }}}/grafana", @@ -406,7 +406,30 @@ spec: ARGO_WORKFLOWS_CLIENT_SECRET=$(curl -sS -H "Content-Type: application/json" \ -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ -X GET ${KEYCLOAK_URL}/admin/realms/cnoe/clients/${CLIENT_ID} | jq -e -r '.secret') + + + + + echo "creating Grafana client" + curl -sS -H "Content-Type: application/json" \ + -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ + -X POST --data @/var/config/grafana-client-payload.json \ + ${KEYCLOAK_URL}/admin/realms/cnoe/clients + CLIENT_ID=$(curl -sS -H "Content-Type: application/json" \ + -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ + -X GET ${KEYCLOAK_URL}/admin/realms/cnoe/clients | jq -e -r '.[] | select(.clientId == "grafana") | .id') + + CLIENT_SCOPE_GROUPS_ID=$(curl -sS -H "Content-Type: application/json" -H "Authorization: bearer ${KEYCLOAK_TOKEN}" -X GET ${KEYCLOAK_URL}/admin/realms/cnoe/client-scopes | jq -e -r '.[] | select(.name == "groups") | .id') + curl -sS -H "Content-Type: application/json" -H "Authorization: bearer ${KEYCLOAK_TOKEN}" -X PUT ${KEYCLOAK_URL}/admin/realms/cnoe/clients/${CLIENT_ID}/default-client-scopes/${CLIENT_SCOPE_GROUPS_ID} + + GRAFANA_CLIENT_SECRET=$(curl -sS -H "Content-Type: application/json" \ + -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ + -X GET ${KEYCLOAK_URL}/admin/realms/cnoe/clients/${CLIENT_ID} | jq -e -r '.secret') + + + + echo "creating Backstage client" curl -sS -H "Content-Type: application/json" \ -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ @@ -441,6 +464,8 @@ spec: ARGOCD_SESSION_TOKEN: ${ARGOCD_SESSION_TOKEN} BACKSTAGE_CLIENT_SECRET: ${BACKSTAGE_CLIENT_SECRET} BACKSTAGE_CLIENT_ID: backstage + GRAFANA_CLIENT_SECRET: ${GRAFANA_CLIENT_SECRET} + GRAFANA_CLIENT_ID: grafana " > /tmp/secret.yaml ./kubectl apply -f /tmp/secret.yaml From 688795ffadb37d1a4bc491610b6b7c1ad92318bf Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 13:46:20 +0100 Subject: [PATCH 16/31] Added more Grafana client config to Keycloak --- template/stacks/monitoring/kube-prometheus/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index c0754b6..7a0a4f1 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -40,6 +40,7 @@ grafana: enabled: true name: Keycloak-OAuth allow_sign_up: true + use_refresh_token: true client_id: $__file{/etc/secrets/auth_generic_oauth/client_id} client_secret: $__file{/etc/secrets/auth_generic_oauth/client_secret} scopes: openid email profile offline_access roles @@ -50,7 +51,7 @@ grafana: token_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/token api_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/userinfo redirect_uri: http://{{{ .Env.DOMAIN }}}/grafana/login/generic_oauth - role_attribute_path: "contains(resource_access.\"grafana-oauth\".roles[*], 'admin') && 'Admin' || contains(resource_access.\"grafana-oauth\".roles[*], 'editor') && 'Editor' || 'Viewer'" + role_attribute_path: "contains(resource_access.\"grafana\".roles[*], 'admin') && 'Admin' || contains(resource_access.\"grafana\".roles[*], 'editor') && 'Editor' || 'Viewer'" extraSecretMounts: - name: auth-generic-oauth-secret-mount From b58e373da9de3d870491053249954192c2f900b1 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 14:19:07 +0100 Subject: [PATCH 17/31] Added email to Keycloak users and upgraded ArgoCD again as it requires more work --- template/stacks/core/argocd.yaml | 2 +- .../keycloak/manifests/keycloak-config.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index 4433721..4f65e09 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -21,7 +21,7 @@ spec: # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged # As logout make problems, it is suggested to switch from path based routing to an own argocd domain, # similar to the CNOE amazon reference implementation and in our case, Forgejo - targetRevision: argo-cd-7.6.12 + targetRevision: argo-cd-7.7.5 helm: valueFiles: - $values/stacks/core/argocd/values.yaml diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index d071f9a..604d714 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -100,11 +100,11 @@ data: user-user1.json: | { "username": "user1", - "email": "", + "email": "user1@user.de", "firstName": "user", "lastName": "one", "requiredActions": [], - "emailVerified": false, + "emailVerified": true, "groups": [ "/admin" ], @@ -113,11 +113,11 @@ data: user-user2.json: | { "username": "user2", - "email": "", + "email": "user2@user.de", "firstName": "user", "lastName": "two", "requiredActions": [], - "emailVerified": false, + "emailVerified": true, "groups": [ "/base-user" ], From 2d3ebadd506e8453d69e3a444337a8b84c98be2a Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 14:52:08 +0100 Subject: [PATCH 18/31] Simplified Keycloaks Grafana config --- .../monitoring/kube-prometheus/values.yaml | 2 +- .../keycloak/manifests/keycloak-config.yaml | 48 ++----------------- 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 7a0a4f1..1e42733 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -51,7 +51,7 @@ grafana: token_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/token api_url: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/protocol/openid-connect/userinfo redirect_uri: http://{{{ .Env.DOMAIN }}}/grafana/login/generic_oauth - role_attribute_path: "contains(resource_access.\"grafana\".roles[*], 'admin') && 'Admin' || contains(resource_access.\"grafana\".roles[*], 'editor') && 'Editor' || 'Viewer'" + role_attribute_path: "contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'editor') && 'Editor' || 'Viewer'" extraSecretMounts: - name: auth-generic-oauth-secret-mount diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 604d714..1b5681f 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -189,20 +189,13 @@ data: "rootUrl": "https://{{{ .Env.DOMAIN }}}/grafana", "adminUrl": "https://{{{ .Env.DOMAIN }}}/grafana", "baseUrl": "https://{{{ .Env.DOMAIN }}}/grafana", - "surrogateAuthRequired": false, - "enabled": true, "alwaysDisplayInConsole": false, - "clientAuthenticatorType": "client-secret", - "secret": "aQ1UV9Z6ZuLBwrgw8vV9ijf6LA95yMZL", "redirectUris": [ "http://{{{ .Env.DOMAIN }}}/grafana/*" ], "webOrigins": [ "https://{{{ .Env.DOMAIN }}}/grafana" ], - "notBefore": 0, - "bearerOnly": false, - "consentRequired": false, "standardFlowEnabled": true, "implicitFlowEnabled": false, "directAccessGrantsEnabled": true, @@ -211,50 +204,19 @@ data: "frontchannelLogout": true, "protocol": "openid-connect", "attributes": { + "saml_idp_initiated_sso_url_name": "", "oidc.ciba.grant.enabled": "false", - "backchannel.logout.session.required": "true", - "display.on.consent.screen": "false", - "oauth2.device.authorization.grant.enabled": "false", - "backchannel.logout.revoke.offline.tokens": "false" + "oauth2.device.authorization.grant.enabled": "false" }, - "authenticationFlowBindingOverrides": {}, - "fullScopeAllowed": true, - "nodeReRegistrationTimeout": -1, - "protocolMappers": [ - { - "name": "client roles", - "protocol": "openid-connect", - "protocolMapper": "oidc-usermodel-client-role-mapper", - "consentRequired": false, - "config": { - "multivalued": "true", - "userinfo.token.claim": "false", - "user.attribute": "foo", - "id.token.claim": "true", - "access.token.claim": "true", - "claim.name": "resource_access.${client_id}.roles", - "jsonType.label": "String" - } - } - ], "defaultClientScopes": [ "web-origins", "acr", - "roles", "offline_access", + "roles", "profile", + "groups", "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "microprofile-jwt" - ], - "access": { - "view": true, - "configure": true, - "manage": true - } + ] } --- From ec31f988896a20f53e6d4d965ab70201e2f12658 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 15:28:48 +0100 Subject: [PATCH 19/31] Added external secret for grafana keycloak client secret --- .../monitoring/kube-prometheus/values.yaml | 2 +- .../keycloak/manifests/keycloak-config.yaml | 6 ------ .../keycloak/manifests/secret-grafana.yaml | 21 +++++++++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 template/stacks/ref-implementation/keycloak/manifests/secret-grafana.yaml diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 1e42733..901345f 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -41,7 +41,7 @@ grafana: name: Keycloak-OAuth allow_sign_up: true use_refresh_token: true - client_id: $__file{/etc/secrets/auth_generic_oauth/client_id} + client_id: grafana client_secret: $__file{/etc/secrets/auth_generic_oauth/client_secret} scopes: openid email profile offline_access roles email_attribute_path: email diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 1b5681f..c271336 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -369,9 +369,6 @@ spec: -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ -X GET ${KEYCLOAK_URL}/admin/realms/cnoe/clients/${CLIENT_ID} | jq -e -r '.secret') - - - echo "creating Grafana client" curl -sS -H "Content-Type: application/json" \ -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ @@ -388,9 +385,6 @@ spec: GRAFANA_CLIENT_SECRET=$(curl -sS -H "Content-Type: application/json" \ -H "Authorization: bearer ${KEYCLOAK_TOKEN}" \ -X GET ${KEYCLOAK_URL}/admin/realms/cnoe/clients/${CLIENT_ID} | jq -e -r '.secret') - - - echo "creating Backstage client" curl -sS -H "Content-Type: application/json" \ diff --git a/template/stacks/ref-implementation/keycloak/manifests/secret-grafana.yaml b/template/stacks/ref-implementation/keycloak/manifests/secret-grafana.yaml new file mode 100644 index 0000000..896ec1b --- /dev/null +++ b/template/stacks/ref-implementation/keycloak/manifests/secret-grafana.yaml @@ -0,0 +1,21 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: auth-generic-oauth-secret + namespace: monitoring +spec: + secretStoreRef: + name: keycloak + kind: ClusterSecretStore + refreshInterval: "0" + target: + name: auth-generic-oauth-secret + template: + engineVersion: v2 + data: + client_secret: "{{.GRAFANA_CLIENT_SECRET}}" + data: + - secretKey: GRAFANA_CLIENT_SECRET + remoteRef: + key: keycloak-clients + property: GRAFANA_CLIENT_SECRET From 6eb52e654cddcfcea0d6d366886a38933542d446 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 15:46:06 +0100 Subject: [PATCH 20/31] Refactored external secret for grafana keycloak client secret --- .../monitoring/kube-prometheus-sso.yaml | 23 +++++++++++++++++++ .../kube-prometheus-sso}/secret-grafana.yaml | 0 2 files changed, 23 insertions(+) create mode 100644 template/stacks/monitoring/kube-prometheus-sso.yaml rename template/stacks/{ref-implementation/keycloak/manifests => monitoring/kube-prometheus-sso}/secret-grafana.yaml (100%) diff --git a/template/stacks/monitoring/kube-prometheus-sso.yaml b/template/stacks/monitoring/kube-prometheus-sso.yaml new file mode 100644 index 0000000..d38d81e --- /dev/null +++ b/template/stacks/monitoring/kube-prometheus-sso.yaml @@ -0,0 +1,23 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kube-prometheus-sso + namespace: argocd + labels: + env: dev + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder + targetRevision: HEAD + path: "stacks/monitoring/kube-prometheus-sso" + destination: + server: "https://kubernetes.default.svc" + namespace: monitoring + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: + selfHeal: true diff --git a/template/stacks/ref-implementation/keycloak/manifests/secret-grafana.yaml b/template/stacks/monitoring/kube-prometheus-sso/secret-grafana.yaml similarity index 100% rename from template/stacks/ref-implementation/keycloak/manifests/secret-grafana.yaml rename to template/stacks/monitoring/kube-prometheus-sso/secret-grafana.yaml From 63a694d17c894fdaf37bfdb7d1b62e895eb2daaa Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 17:09:02 +0100 Subject: [PATCH 21/31] Removed Grafana admin account --- template/stacks/monitoring/kube-prometheus/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 901345f..584b767 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -1,10 +1,10 @@ grafana: namespaceOverride: "monitoring" - admin: - existingSecret: "kube-prometheus-stack-grafana-admin-password" - userKey: admin-user - passwordKey: admin-password + #admin: + # existingSecret: "kube-prometheus-stack-grafana-admin-password" + # userKey: admin-user + # passwordKey: admin-password defaultDashboardsTimezone: Europe/Berlin From 1ef1029e1f8c3750f5e22a167193aa626dfe8fae Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Sun, 2 Mar 2025 17:26:29 +0100 Subject: [PATCH 22/31] Added Grafana admin account --- template/stacks/monitoring/kube-prometheus/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/monitoring/kube-prometheus/values.yaml b/template/stacks/monitoring/kube-prometheus/values.yaml index 584b767..901345f 100644 --- a/template/stacks/monitoring/kube-prometheus/values.yaml +++ b/template/stacks/monitoring/kube-prometheus/values.yaml @@ -1,10 +1,10 @@ grafana: namespaceOverride: "monitoring" - #admin: - # existingSecret: "kube-prometheus-stack-grafana-admin-password" - # userKey: admin-user - # passwordKey: admin-password + admin: + existingSecret: "kube-prometheus-stack-grafana-admin-password" + userKey: admin-user + passwordKey: admin-password defaultDashboardsTimezone: Europe/Berlin From 8a38aee529516a78532f2056a275c6008bb2f091 Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Mon, 3 Mar 2025 15:21:46 +0100 Subject: [PATCH 23/31] feat(runner): Added ubuntu-latest runner tag --- .../stacks/core/forgejo-runner/dind-docker.yaml | 13 ++++++++++++- template/stacks/core/forgejo/values.yaml | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/template/stacks/core/forgejo-runner/dind-docker.yaml b/template/stacks/core/forgejo-runner/dind-docker.yaml index bad42d5..04b07a7 100644 --- a/template/stacks/core/forgejo-runner/dind-docker.yaml +++ b/template/stacks/core/forgejo-runner/dind-docker.yaml @@ -29,7 +29,18 @@ spec: initContainers: - name: runner-register image: code.forgejo.org/forgejo/runner:6.0.1 - command: ["forgejo-runner", "register", "--no-interactive", "--token", $(RUNNER_SECRET), "--name", $(RUNNER_NAME), "--instance", $(FORGEJO_INSTANCE_URL), "--labels", "docker:docker://node:20-bookworm,ubuntu-22.04:docker://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/catthehackerubuntu:act-22.04"] + command: + - "forgejo-runner" + - "register" + - "--no-interactive" + - "--token" + - $(RUNNER_SECRET) + - "--name" + - $(RUNNER_NAME) + - "--instance" + - $(FORGEJO_INSTANCE_URL) + - "--labels" + - "docker:docker://node:20-bookworm,ubuntu-22.04:docker://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/catthehackerubuntu:act-22.04,ubuntu-latest:docker://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/catthehackerubuntu:act-22.04" env: - name: RUNNER_NAME valueFrom: diff --git a/template/stacks/core/forgejo/values.yaml b/template/stacks/core/forgejo/values.yaml index dda08f7..1bf35c2 100644 --- a/template/stacks/core/forgejo/values.yaml +++ b/template/stacks/core/forgejo/values.yaml @@ -53,3 +53,4 @@ forgejo: - docker:docker://node:16-bullseye - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04 - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04 + - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04 From d95ba7c12c65d268774dd2fc9acf5cfecef5152e Mon Sep 17 00:00:00 2001 From: Patrick Sy Date: Mon, 3 Mar 2025 16:37:18 +0100 Subject: [PATCH 24/31] chore(petclinic): Removed unused workflow Disabled tests in maven workflow as there are currently dind problems --- .../.github/workflows/gradle-build.yml | 32 ------------------- .../.github/workflows/maven-build.yml | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/gradle-build.yml diff --git a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/gradle-build.yml b/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/gradle-build.yml deleted file mode 100644 index 61fadfd..0000000 --- a/template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/gradle-build.yml +++ /dev/null @@ -1,32 +0,0 @@ -# This workflow will build a Java project with Gradle, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-gradle - -name: Java CI with Gradle - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - matrix: - java: [ '17' ] - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK {% raw %}${{matrix.java}}{% endraw %} - uses: https://github.com/actions/setup-java@v4 - with: - java-version: '{% raw %}${{matrix.java}}{% endraw %}' - distribution: 'adopt' - cache: maven - - name: Setup Gradle - uses: https://github.com/gradle/actions/setup-gradle@v4 - - name: Build with Gradle - run: ./gradlew build - 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 a9058fc..c750bd4 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 @@ -28,7 +28,7 @@ jobs: distribution: 'adopt' cache: maven - name: Build with Maven Wrapper - run: ./mvnw -B verify + run: ./mvnw -B -DskipTests verify - name: Build image #run: ./mvnw spring-boot:build-image # the original image build run: | From 4ae8f6fd15c8702cf184802c841feb552850c19f Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Tue, 4 Mar 2025 18:49:55 +0100 Subject: [PATCH 25/31] shortened retry backoff --- template/stacks/ref-implementation/argo-workflows.yaml | 4 ++++ template/stacks/ref-implementation/backstage.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/template/stacks/ref-implementation/argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows.yaml index 3d33891..d001daa 100644 --- a/template/stacks/ref-implementation/argo-workflows.yaml +++ b/template/stacks/ref-implementation/argo-workflows.yaml @@ -23,3 +23,7 @@ spec: selfHeal: true retry: limit: -1 + backoff: + duration: 5s + factor: 1 + maxDuration: 10s diff --git a/template/stacks/ref-implementation/backstage.yaml b/template/stacks/ref-implementation/backstage.yaml index 227d29f..c007181 100644 --- a/template/stacks/ref-implementation/backstage.yaml +++ b/template/stacks/ref-implementation/backstage.yaml @@ -23,3 +23,7 @@ spec: selfHeal: true retry: limit: -1 + backoff: + duration: 5s + factor: 1 + maxDuration: 10s From aba4a4a0880690dfc1df99c44228eb5e7b3e7a84 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Tue, 4 Mar 2025 19:03:36 +0100 Subject: [PATCH 26/31] shortened retry backoff --- template/stacks/ref-implementation/argo-workflows.yaml | 4 ++-- template/stacks/ref-implementation/backstage.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template/stacks/ref-implementation/argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows.yaml index d001daa..ef23482 100644 --- a/template/stacks/ref-implementation/argo-workflows.yaml +++ b/template/stacks/ref-implementation/argo-workflows.yaml @@ -24,6 +24,6 @@ spec: retry: limit: -1 backoff: - duration: 5s + duration: 15s factor: 1 - maxDuration: 10s + maxDuration: 15s diff --git a/template/stacks/ref-implementation/backstage.yaml b/template/stacks/ref-implementation/backstage.yaml index c007181..01932dc 100644 --- a/template/stacks/ref-implementation/backstage.yaml +++ b/template/stacks/ref-implementation/backstage.yaml @@ -24,6 +24,6 @@ spec: retry: limit: -1 backoff: - duration: 5s + duration: 15s factor: 1 - maxDuration: 10s + maxDuration: 15s From d0cce6916d367cad1b25cd3da77c19ddfd7f1e06 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Tue, 4 Mar 2025 19:06:11 +0100 Subject: [PATCH 27/31] fixed argocd version --- template/stacks/core/argocd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml index 4433721..4f65e09 100644 --- a/template/stacks/core/argocd.yaml +++ b/template/stacks/core/argocd.yaml @@ -21,7 +21,7 @@ spec: # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged # As logout make problems, it is suggested to switch from path based routing to an own argocd domain, # similar to the CNOE amazon reference implementation and in our case, Forgejo - targetRevision: argo-cd-7.6.12 + targetRevision: argo-cd-7.7.5 helm: valueFiles: - $values/stacks/core/argocd/values.yaml From a9c69d6c24cd5f6b7032e8513d4afd4ba867b5f2 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Tue, 4 Mar 2025 19:23:19 +0100 Subject: [PATCH 28/31] adjusted retry backoff time --- template/stacks/monitoring/kube-prometheus-sso.yaml | 6 ++++++ template/stacks/monitoring/kube-prometheus.yaml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/template/stacks/monitoring/kube-prometheus-sso.yaml b/template/stacks/monitoring/kube-prometheus-sso.yaml index d38d81e..0e6e43a 100644 --- a/template/stacks/monitoring/kube-prometheus-sso.yaml +++ b/template/stacks/monitoring/kube-prometheus-sso.yaml @@ -21,3 +21,9 @@ spec: - CreateNamespace=true automated: selfHeal: true + retry: + limit: -1 + backoff: + duration: 15s + factor: 1 + maxDuration: 15s diff --git a/template/stacks/monitoring/kube-prometheus.yaml b/template/stacks/monitoring/kube-prometheus.yaml index 1f5218c..7bcf3ca 100644 --- a/template/stacks/monitoring/kube-prometheus.yaml +++ b/template/stacks/monitoring/kube-prometheus.yaml @@ -17,6 +17,10 @@ spec: - ServerSideApply=true # do not copy metdata, since (because of its large size) it can lead to sync failure retry: limit: -1 + backoff: + duration: 15s + factor: 1 + maxDuration: 15s destination: name: in-cluster namespace: monitoring From 1ab8119063b54aba69dfcef1508e591d461e0065 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Fri, 7 Mar 2025 20:28:39 +0000 Subject: [PATCH 29/31] Fixed kubectl download on Linux ARM64 VMs --- .../keycloak/manifests/keycloak-config.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index c271336..6c8d603 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -285,7 +285,11 @@ spec: fi set -e - curl -sS -LO "https://dl.k8s.io/release/v1.28.3//bin/linux/amd64/kubectl" + if [[ "$(uname -m)" == "x86_64" ]]; then + curl -sS -LO "https://dl.k8s.io/release/v1.28.3//bin/linux/amd64/kubectl" + else + curl -sS -LO "https://dl.k8s.io/release/v1.28.3//bin/linux/arm64/kubectl" + fi chmod +x kubectl echo "creating cnoe realm and groups" From 303d7b3a7e9e1b44aeecf497ffbfc17d83c34fed Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Sat, 8 Mar 2025 12:50:23 +0000 Subject: [PATCH 30/31] Update template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml --- .../skeleton/.github/workflows/maven-build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 c750bd4..62cbd53 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={{{ .Env.DOMAIN_GITEA }}}/${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 %} -Djib.from.platforms=linux/arm64,linux/amd64 - name: Build image as tar run: | ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:buildTar -Djib.allowInsecureRegistries=true @@ -57,7 +57,11 @@ jobs: NODE_TLS_REJECT_UNAUTHORIZED: 0 # This is necessary due to self signed certs for forgejo, proper setups can skip this - name: install trivy from deb package run: | - wget -O trivy.deb https://github.com/aquasecurity/trivy/releases/download/v0.58.0/trivy_0.58.0_Linux-64bit.deb + if [[ "$(uname -m)" == "x86_64" ]]; then + wget -O trivy.deb https://github.com/aquasecurity/trivy/releases/download/v0.58.0/trivy_0.58.0_Linux-64bit.deb + else + wget -O trivy.deb https://github.com/aquasecurity/trivy/releases/download/v0.58.0/trivy_0.58.0_Linux-ARM64.deb + fi DEBIAN_FRONTEND=noninteractive dpkg -i trivy.deb - name: scan the image run: trivy image --input jib-image.tar From 364a65a6be4f8e5b7ab7a6bc9584ab5bdc9287e2 Mon Sep 17 00:00:00 2001 From: miwr Date: Tue, 11 Mar 2025 13:08:15 +0100 Subject: [PATCH 31/31] alloy configuration added --- template/stacks/monitoring/alloy.yaml | 29 ++++++++++++++++++++ template/stacks/monitoring/alloy/values.yaml | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 template/stacks/monitoring/alloy.yaml create mode 100644 template/stacks/monitoring/alloy/values.yaml diff --git a/template/stacks/monitoring/alloy.yaml b/template/stacks/monitoring/alloy.yaml new file mode 100644 index 0000000..7d4d614 --- /dev/null +++ b/template/stacks/monitoring/alloy.yaml @@ -0,0 +1,29 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: alloy + 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: monitoring + sources: + - repoURL: https://github.com/grafana/alloy.git + path: operations/helm/charts/alloy + targetRevision: HEAD + helm: + valueFiles: + - $values/stacks/monitoring/alloy/values.yaml + - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder + targetRevision: HEAD + ref: values \ No newline at end of file diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml new file mode 100644 index 0000000..3f038fa --- /dev/null +++ b/template/stacks/monitoring/alloy/values.yaml @@ -0,0 +1,4 @@ +alloy: + create: false + name: alloy-config + key: config.alloy