Initial upload

2025-05-21 16:13:46 +02:00 · 2025-05-21 16:13:46 +02:00 · b304a1a87c
commit b304a1a87c
parent 4b92302600
17 changed files with 29 additions and 29 deletions
--- a/otc/ABC/stacks/core/forgejo-runner/dind-docker.yaml
+++ b/otc/ABC/stacks/core/forgejo-runner/dind-docker.yaml
@ -51,7 +51,7 @@ spec:
                  name: forgejo-runner-token
                  key: token
            - name: FORGEJO_INSTANCE_URL
-              value: https://gitea.ABC
+              value: https://ABC
          volumeMounts:
            - name: runner-data
              mountPath: /data
--- a/otc/ABC/stacks/core/forgejo/values.yaml
+++ b/otc/ABC/stacks/core/forgejo/values.yaml
@ -30,11 +30,11 @@ gitea:
    queue:
      TYPE: level
    server:
-      DOMAIN: 'gitea.ABC'
-      ROOT_URL: 'https://gitea.ABC:443'
+      DOMAIN: 'ABC'
+      ROOT_URL: 'https://ABC:443'
    mailer:
      ENABLED: true
-      FROM: forgejo@gitea.ABC
+      FROM: forgejo@ABC
      PROTOCOL: smtp
      SMTP_ADDR: mailhog.mailhog.svc.cluster.local
      SMTP_PORT: 1025
--- a/otc/ABC/stacks/core/ingress-apps/forgejo.yaml
+++ b/otc/ABC/stacks/core/ingress-apps/forgejo.yaml
@ -11,7 +11,7 @@ metadata:
 spec:
  ingressClassName: nginx
  rules:
-  - host: gitea.ABC
+  - host: ABC
    http:
      paths:
      - backend:
@ -23,5 +23,5 @@ spec:
        pathType: Prefix
  tls:
  - hosts:
-    - gitea.ABC
+    - ABC
    secretName: forgejo-net-tls
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml
+++ b/otc/ABC/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:443
+    - url: https://ABC:443
      title: Repo URL
      icon: github
 spec:
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml
+++ b/otc/ABC/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:443/?repo=${{parameters.name}}
+        repoUrl: ABC: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:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://ABC:443/giteaAdmin/${{parameters.name}}
        path: "kustomize/base"
    - id: register
      name: Register
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml
+++ b/otc/ABC/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:443
+    - url: https://ABC:443
      title: Repo URL
      icon: github
 spec:
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml
+++ b/otc/ABC/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:443/?repo=${{parameters.name}}
+        repoUrl: ABC: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:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://ABC:443/giteaAdmin/${{parameters.name}}
        path: "manifests"
    - id: register
      name: Register
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml
+++ b/otc/ABC/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:443
+    - url: https://ABC:443
      title: Repo URL
      icon: github
 spec:
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml
+++ b/otc/ABC/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:443/?repo=${{parameters.name}}
+        repoUrl: ABC: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:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://ABC:443/giteaAdmin/${{parameters.name}}
        path: "manifests"
    - id: register
      name: Register
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml
+++ b/otc/ABC/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:443
+    - url: https://ABC:443
      title: Repo URL
      icon: git
 spec:
@ -26,7 +26,7 @@ metadata:
  annotations:
    backstage.io/techdocs-ref: dir:.
  links:
-    - url: https://gitea.ABC:443
+    - url: https://ABC:443
      title: Gitea Repo
      icon: git
 spec:
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml
+++ b/otc/ABC/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:443/?repo=${{parameters.name}}
+        repoUrl: ABC:443/?repo=${{parameters.name}}
        description: This is the repository for ${{ parameters.name }}
        sourcePath: ./skeleton
        defaultBranch: main
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml
+++ b/otc/ABC/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/${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/${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
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml
+++ b/otc/ABC/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:443
+    - url: https://ABC:443
      title: Repo URL
      icon: git
 spec:
@ -26,7 +26,7 @@ metadata:
  annotations:
    backstage.io/techdocs-ref: dir:.
  links:
-    - url: https://gitea.ABC:443
+    - url: https://ABC:443
      title: Gitea Repo
      icon: git
 spec:
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml
+++ b/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml
@ -58,7 +58,7 @@ spec:
    spec:
      containers:
        - name: workload
-          image: gitea.ABC/giteaadmin/${{ values.name }}
+          image: ABC/giteaadmin/${{ values.name }}
          env:
            - name: SPRING_PROFILES_ACTIVE
              value: postgres
--- a/otc/ABC/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml
+++ b/otc/ABC/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:443/?repo=${{parameters.name}}
+        repoUrl: ABC: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:443/giteaAdmin/${{parameters.name}}
+        repoUrl: https://ABC:443/giteaAdmin/${{parameters.name}}
        path: "k8s"

    - id: register
--- a/otc/ABC/stacks/ref-implementation/backstage/manifests/install.yaml
+++ b/otc/ABC/stacks/ref-implementation/backstage/manifests/install.yaml
@ -106,12 +106,12 @@ data:

    integrations:
      gitea:
-        - baseUrl: https://gitea.ABC:443
-          host: gitea.ABC:443
+        - baseUrl: https://ABC:443
+          host: ABC:443
          username: ${GITEA_USERNAME}
          password: ${GITEA_PASSWORD}
-        - baseUrl: https://gitea.ABC
-          host: gitea.ABC
+        - baseUrl: https://ABC
+          host: ABC
          username: ${GITEA_USERNAME}
          password: ${GITEA_PASSWORD}
        - baseUrl: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live
--- a/otc/ABC/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
+++ b/otc/ABC/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
@ -270,7 +270,7 @@ data:
      "rootUrl": "",
      "baseUrl": "",
      "redirectUris": [
-        "https://gitea.ABC/*"
+        "https://ABC/*"
      ],
      "webOrigins": [
        "/*"