From 0d49c582f5c13ed1a979139ebc6b420c7e6abd51 Mon Sep 17 00:00:00 2001 From: "Christopher.Hase" Date: Tue, 11 Mar 2025 11:25:06 +0000 Subject: [PATCH 01/12] template/stacks/ref-implementation/backstage/manifests/install.yaml aktualisiert --- .../stacks/ref-implementation/backstage/manifests/install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index b3bfd57..cab2f36 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -262,7 +262,7 @@ spec: name: gitea-credentials - secretRef: name: argocd-credentials - image: ghcr.io/cnoe-io/backstage-app:9232d633b2698fffa6d0a73b715e06640d170162 + image: gitea-client-192-168-198-3.traefik.me/giteaadmin/backstage:0.0.1 name: backstage ports: - containerPort: 7007 From 3293f9cf5afe358e6928d9b5806e3b5a786bcc5b Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 13 Mar 2025 08:33:06 +0000 Subject: [PATCH 02/12] Update template/stacks/ref-implementation/backstage/manifests/install.yaml --- .../stacks/ref-implementation/backstage/manifests/install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index cab2f36..5cbfff8 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -262,7 +262,7 @@ spec: name: gitea-credentials - secretRef: name: argocd-credentials - image: gitea-client-192-168-198-3.traefik.me/giteaadmin/backstage:0.0.1 + image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/backstage-edp:v1.36.1 name: backstage ports: - containerPort: 7007 From 74a77bfa3b71dc4a2d4a2f6fe53fa80b03b48770 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 13 Mar 2025 09:00:38 +0000 Subject: [PATCH 03/12] Update template/stacks/ref-implementation/backstage/manifests/install.yaml --- .../stacks/ref-implementation/backstage/manifests/install.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index 5cbfff8..646e269 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -255,6 +255,8 @@ spec: value: debug - name: NODE_TLS_REJECT_UNAUTHORIZED value: "0" + - name: NODE_OPTIONS + value: "--no-node-snapshot" envFrom: - secretRef: name: backstage-env-vars From d8867b9e3adc010c178a16a688d5542633d85c0b Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 13 Mar 2025 10:16:04 +0000 Subject: [PATCH 04/12] Update template/stacks/ref-implementation/backstage/manifests/install.yaml --- .../stacks/ref-implementation/backstage/manifests/install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index 646e269..6a2e847 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -264,7 +264,7 @@ spec: name: gitea-credentials - secretRef: name: argocd-credentials - image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/backstage-edp:v1.36.1 + image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/backstage-cnoe:v1.36.1 name: backstage ports: - containerPort: 7007 From 2f5a2635115906cec90fe0c457f308b7bcb0bb8c Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 13 Mar 2025 16:08:10 +0000 Subject: [PATCH 05/12] Update template/stacks/core/argocd/values.yaml --- template/stacks/core/argocd/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/stacks/core/argocd/values.yaml b/template/stacks/core/argocd/values.yaml index 3fb3ddf..a5cee37 100644 --- a/template/stacks/core/argocd/values.yaml +++ b/template/stacks/core/argocd/values.yaml @@ -5,6 +5,7 @@ configs: params: server.insecure: true server.basehref: /argocd + server.rootpath: /argocd cm: application.resourceTrackingMethod: annotation timeout.reconciliation: 60s @@ -20,6 +21,7 @@ configs: clusters: - "*" accounts.provider-argocd: apiKey + url: https://{{{ .Env.DOMAIN }}}/argocd rbac: policy.csv: 'g, provider-argocd, role:admin' From 5cc22c5648100ab770866439c969f0c527cfbc9d Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Thu, 13 Mar 2025 16:16:49 +0000 Subject: [PATCH 06/12] Update template/stacks/core/ingress-apps/argocd-server.yaml --- template/stacks/core/ingress-apps/argocd-server.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/template/stacks/core/ingress-apps/argocd-server.yaml b/template/stacks/core/ingress-apps/argocd-server.yaml index 0446b6c..3aa47f2 100644 --- a/template/stacks/core/ingress-apps/argocd-server.yaml +++ b/template/stacks/core/ingress-apps/argocd-server.yaml @@ -4,8 +4,6 @@ metadata: annotations: nginx.ingress.kubernetes.io/backend-protocol: HTTP nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - nginx.ingress.kubernetes.io/rewrite-target: /$2 - nginx.ingress.kubernetes.io/use-regex: "true" {{{ if eq .Env.CLUSTER_TYPE "osc" }}} dns.gardener.cloud/class: garden dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}} @@ -24,8 +22,8 @@ spec: name: argocd-server port: number: 80 - path: /argocd(/|$)(.*) - pathType: ImplementationSpecific + path: /argocd + pathType: Prefix tls: - hosts: - {{{ .Env.DOMAIN }}} From beeb1f916ba09b429237ad5296a17a6a4b2ba3f5 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Fri, 14 Mar 2025 09:34:45 +0100 Subject: [PATCH 07/12] Hofix for ArgoCD problems after path routing fix --- .../stacks/ref-implementation/backstage/manifests/install.yaml | 2 +- .../ref-implementation/keycloak/manifests/keycloak-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index 6a2e847..da9bd6a 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -388,7 +388,7 @@ spec: 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/' + ARGO_CD_URL: 'https://{{{ .Env.DOMAIN }}}/argocd/api/v1/' data: - secretKey: ARGOCD_SESSION_TOKEN remoteRef: diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 6c8d603..c1d77a7 100644 --- a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -409,7 +409,7 @@ spec: ARGOCD_PASSWORD=$(./kubectl -n argocd get secret argocd-initial-admin-secret -o go-template='{{.data.password | base64decode }}') - ARGOCD_SESSION_TOKEN=$(curl -k -sS http://argocd-server.argocd.svc.cluster.local:443/api/v1/session -H 'Content-Type: application/json' -d "{\"username\":\"admin\",\"password\":\"${ARGOCD_PASSWORD}\"}" | jq -r .token) + ARGOCD_SESSION_TOKEN=$(curl -sS https://{{{ .Env.DOMAIN }}}/argocd/api/v1/session -H 'Content-Type: application/json' -d "{\"username\":\"admin\",\"password\":\"${ARGOCD_PASSWORD}\"}" | jq -r .token) echo \ "apiVersion: v1 From c1b68bfdb2031f5222f1ae9f339efab0724c9126 Mon Sep 17 00:00:00 2001 From: Stephan Lo Date: Fri, 14 Mar 2025 19:20:29 +0100 Subject: [PATCH 08/12] chore(provider-shell): adjust to https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/-/packages/container/provider-shell/v0.1.3 --- template/stacks/core/crossplane-providers/provider-shell.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/crossplane-providers/provider-shell.yaml b/template/stacks/core/crossplane-providers/provider-shell.yaml index 4080668..e7af743 100644 --- a/template/stacks/core/crossplane-providers/provider-shell.yaml +++ b/template/stacks/core/crossplane-providers/provider-shell.yaml @@ -3,7 +3,7 @@ kind: Provider metadata: name: provider-shell spec: - package: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/provider-shell:v0.1.1 + package: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/provider-shell:v0.1.3 packagePullPolicy: IfNotPresent # Only download the package if it isn’t in the cache. revisionActivationPolicy: Automatic # Otherwise our Provider never gets activate & healthy revisionHistoryLimit: 1 From 9b5457e45fc08818d7f7cb05ce7d2465b86c0983 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Sat, 15 Mar 2025 13:27:41 +0000 Subject: [PATCH 09/12] Update template/stacks/ref-implementation/backstage/manifests/install.yaml chore(backstage): adjust to forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/backstage-edp:development --- .../stacks/ref-implementation/backstage/manifests/install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml index da9bd6a..c86f6fa 100644 --- a/template/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml @@ -264,7 +264,7 @@ spec: name: gitea-credentials - secretRef: name: argocd-credentials - image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/backstage-cnoe:v1.36.1 + image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/backstage-edp:development name: backstage ports: - containerPort: 7007 From 31b768eebc7a5186aec1b7375682c91700f535a2 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Sun, 16 Mar 2025 22:51:03 +0000 Subject: [PATCH 10/12] Update template/stacks/core/crossplane-providers/provider-kind.yaml --- .../stacks/core/crossplane-providers/provider-kind.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/stacks/core/crossplane-providers/provider-kind.yaml b/template/stacks/core/crossplane-providers/provider-kind.yaml index 36014f7..5bfe9a1 100644 --- a/template/stacks/core/crossplane-providers/provider-kind.yaml +++ b/template/stacks/core/crossplane-providers/provider-kind.yaml @@ -3,7 +3,7 @@ kind: Provider metadata: name: provider-kind spec: - package: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/provider-kind:v0.1.0 - packagePullPolicy: IfNotPresent # Only download the package if it isn’t in the cache. - revisionActivationPolicy: Automatic # Otherwise our Provider never gets activate & healthy + package: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/provider-kind:v0.1.1 + packagePullPolicy: IfNotPresent + revisionActivationPolicy: Automatic revisionHistoryLimit: 1 From 94e3a759b25fe786f59bdcf1d9dc0d2db5532fa9 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Sun, 16 Mar 2025 22:53:03 +0000 Subject: [PATCH 11/12] Update template/stacks/core/crossplane-providers/provider-shell.yaml --- .../stacks/core/crossplane-providers/provider-shell.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/stacks/core/crossplane-providers/provider-shell.yaml b/template/stacks/core/crossplane-providers/provider-shell.yaml index e7af743..2974c0c 100644 --- a/template/stacks/core/crossplane-providers/provider-shell.yaml +++ b/template/stacks/core/crossplane-providers/provider-shell.yaml @@ -3,7 +3,7 @@ kind: Provider metadata: name: provider-shell spec: - package: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/provider-shell:v0.1.3 - packagePullPolicy: IfNotPresent # Only download the package if it isn’t in the cache. - revisionActivationPolicy: Automatic # Otherwise our Provider never gets activate & healthy + package: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/provider-shell:v0.1.5 + packagePullPolicy: IfNotPresent + revisionActivationPolicy: Automatic revisionHistoryLimit: 1 From fc287acf58c936242d664a4c661ba423a8bca055 Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Mon, 17 Mar 2025 21:50:50 +0000 Subject: [PATCH 12/12] Update template/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml --- .../spring-petclinic/skeleton/.github/workflows/maven-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 62cbd53..e553542 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 %} -Djib.from.platforms=linux/arm64,linux/amd64 + ./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 %}${{ secrets.PACKAGES_USER }}{% 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