From e2d072ab7972c64c6f5df6158fe6dfc198a876af Mon Sep 17 00:00:00 2001 From: Automated pipeline Date: Mon, 16 Jun 2025 12:48:43 +0000 Subject: [PATCH] Initial upload --- .../core/argocd/manifests/argocd-server-ingress.yaml | 4 ++-- otc/abc.t09.de/stacks/core/argocd/values.yaml | 4 ++-- .../stacks/forgejo/forgejo-runner/dind-docker.yaml | 2 +- .../forgejo/forgejo-server/manifests/forgejo-ingress.yaml | 4 ++-- otc/abc.t09.de/stacks/forgejo/forgejo-server/values.yaml | 4 ++-- .../entities/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 +- .../entities/spring-petclinic/skeleton/catalog-info.yaml | 4 ++-- .../entities/spring-petclinic/skeleton/k8s/petclinic.yml | 2 +- .../entities/spring-petclinic/template.yaml | 4 ++-- .../ref-implementation/backstage/manifests/install.yaml | 8 ++++---- .../keycloak/manifests/keycloak-config.yaml | 2 +- 19 files changed, 32 insertions(+), 32 deletions(-) diff --git a/otc/abc.t09.de/stacks/core/argocd/manifests/argocd-server-ingress.yaml b/otc/abc.t09.de/stacks/core/argocd/manifests/argocd-server-ingress.yaml index 790f788..bee82e4 100644 --- a/otc/abc.t09.de/stacks/core/argocd/manifests/argocd-server-ingress.yaml +++ b/otc/abc.t09.de/stacks/core/argocd/manifests/argocd-server-ingress.yaml @@ -11,7 +11,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: abc.t09.de + - host: argocd.argocd.abc.t09.de http: paths: - backend: @@ -23,5 +23,5 @@ spec: pathType: Prefix tls: - hosts: - - abc.t09.de + - argocd.abc.t09.de secretName: argocd-net-tls diff --git a/otc/abc.t09.de/stacks/core/argocd/values.yaml b/otc/abc.t09.de/stacks/core/argocd/values.yaml index f12d75a..baa26d6 100644 --- a/otc/abc.t09.de/stacks/core/argocd/values.yaml +++ b/otc/abc.t09.de/stacks/core/argocd/values.yaml @@ -1,5 +1,5 @@ global: - domain: abc.t09.de + domain: argocd.abc.t09.de configs: params: @@ -21,7 +21,7 @@ configs: clusters: - "*" accounts.provider-argocd: apiKey - url: https://abc.t09.de/argocd + url: https://argocd.abc.t09.de/argocd rbac: policy.csv: 'g, provider-argocd, role:admin' diff --git a/otc/abc.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/abc.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml index 6d360a2..7c17729 100644 --- a/otc/abc.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml +++ b/otc/abc.t09.de/stacks/forgejo/forgejo-runner/dind-docker.yaml @@ -51,7 +51,7 @@ spec: name: forgejo-runner-token key: token - name: FORGEJO_INSTANCE_URL - value: https://gitea.abc.t09.de + value: https://abc.t09.de volumeMounts: - name: runner-data mountPath: /data diff --git a/otc/abc.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml b/otc/abc.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml index 6c06d0c..76a49d8 100644 --- a/otc/abc.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml +++ b/otc/abc.t09.de/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml @@ -11,7 +11,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: gitea.abc.t09.de + - host: abc.t09.de http: paths: - backend: @@ -23,5 +23,5 @@ spec: pathType: Prefix tls: - hosts: - - gitea.abc.t09.de + - abc.t09.de secretName: forgejo-net-tls diff --git a/otc/abc.t09.de/stacks/forgejo/forgejo-server/values.yaml b/otc/abc.t09.de/stacks/forgejo/forgejo-server/values.yaml index e2ac6cc..69c1827 100644 --- a/otc/abc.t09.de/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/abc.t09.de/stacks/forgejo/forgejo-server/values.yaml @@ -132,8 +132,8 @@ gitea: DB_TYPE: postgres server: - DOMAIN: 'gitea.abc.t09.de' - ROOT_URL: 'https://gitea.abc.t09.de:443' + DOMAIN: 'abc.t09.de' + ROOT_URL: 'https://abc.t09.de:443' mailer: ENABLED: true diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml index 2a26aeb..a5f42b9 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Repo URL icon: github spec: diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml index 2970f66..a3c0dc7 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443/?repo=${{parameters.name}} + repoUrl: abc.t09.de: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.abc.t09.de:443/giteaAdmin/${{parameters.name}} + repoUrl: https://abc.t09.de:443/giteaAdmin/${{parameters.name}} path: "kustomize/base" - id: register name: Register diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml index 33dd818..1e2f2dc 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Repo URL icon: github spec: diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml index c3f8730..e16e646 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443/?repo=${{parameters.name}} + repoUrl: abc.t09.de: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.abc.t09.de:443/giteaAdmin/${{parameters.name}} + repoUrl: https://abc.t09.de:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml index 812150f..42bb7f4 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Repo URL icon: github spec: diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml index 67e3c02..6d794a9 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443/?repo=${{parameters.name}} + repoUrl: abc.t09.de: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.abc.t09.de:443/giteaAdmin/${{parameters.name}} + repoUrl: https://abc.t09.de:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml index 9cad20b..527dc12 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Gitea Repo icon: git spec: diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml index 2f6dda4..27546ca 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443/?repo=${{parameters.name}} + repoUrl: abc.t09.de:443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./skeleton defaultBranch: main diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml index 563a726..e9f4fcc 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml +++ b/otc/abc.t09.de/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.abc.t09.de/${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 + ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage=abc.t09.de/${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 diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml index 5de972a..cfd611b 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.abc.t09.de:443 + - url: https://abc.t09.de:443 title: Gitea Repo icon: git spec: diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml index 023d400..61d0825 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml +++ b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml @@ -58,7 +58,7 @@ spec: spec: containers: - name: workload - image: gitea.abc.t09.de/giteaadmin/${{ values.name }} + image: abc.t09.de/giteaadmin/${{ values.name }} env: - name: SPRING_PROFILES_ACTIVE value: postgres diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml index afbff2b..def7f28 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml +++ b/otc/abc.t09.de/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.abc.t09.de:443/?repo=${{parameters.name}} + repoUrl: abc.t09.de: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.abc.t09.de:443/giteaAdmin/${{parameters.name}} + repoUrl: https://abc.t09.de:443/giteaAdmin/${{parameters.name}} path: "k8s" - id: register diff --git a/otc/abc.t09.de/stacks/ref-implementation/backstage/manifests/install.yaml b/otc/abc.t09.de/stacks/ref-implementation/backstage/manifests/install.yaml index c4da6bc..2bff136 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/otc/abc.t09.de/stacks/ref-implementation/backstage/manifests/install.yaml @@ -106,12 +106,12 @@ data: integrations: gitea: - - baseUrl: https://gitea.abc.t09.de:443 - host: gitea.abc.t09.de:443 + - baseUrl: https://abc.t09.de:443 + host: abc.t09.de:443 username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - - baseUrl: https://gitea.abc.t09.de - host: gitea.abc.t09.de + - baseUrl: https://abc.t09.de + host: abc.t09.de username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - baseUrl: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live diff --git a/otc/abc.t09.de/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/otc/abc.t09.de/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 5261fef..c7c6314 100644 --- a/otc/abc.t09.de/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/otc/abc.t09.de/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -270,7 +270,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://gitea.abc.t09.de/*" + "https://abc.t09.de/*" ], "webOrigins": [ "/*"