From 2f15b6b3734fe2861f749e94c0342ae7da3d4421 Mon Sep 17 00:00:00 2001 From: Automated pipeline Date: Tue, 17 Mar 2026 13:25:52 +0000 Subject: [PATCH] Automated upload for edp.buildth.ing --- .../stacks/forgejo/forgejo-server/values.yaml | 5 +++- otc/edp.buildth.ing/stacks/garm/garm.yaml | 2 +- .../stacks/garm/garm/values.yaml | 3 +++ ...iser-receiver.yaml => sizer-receiver.yaml} | 4 +-- .../deployment.yaml | 26 +++++++++---------- .../ingress.yaml | 10 +++---- 6 files changed, 28 insertions(+), 22 deletions(-) rename otc/edp.buildth.ing/stacks/garm/{optimiser-receiver.yaml => sizer-receiver.yaml} (84%) rename otc/edp.buildth.ing/stacks/garm/{optimiser-receiver => sizer-receiver}/deployment.yaml (77%) rename otc/edp.buildth.ing/stacks/garm/{optimiser-receiver => sizer-receiver}/ingress.yaml (69%) diff --git a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml index 2b64cca..c9e7a8a 100644 --- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml @@ -137,6 +137,9 @@ gitea: ENABLED: true ADAPTER: redis + security: + GLOBAL_TWO_FACTOR_REQUIREMENT: admin + service: DISABLE_REGISTRATION: true ENABLE_NOTIFY_MAIL: true @@ -177,4 +180,4 @@ image: # rootless: true fullOverride: observability.buildth.ing/devfw-cicd/edp-forgejo:14.0.2-edp1-rootless -forgejo: {} \ No newline at end of file +forgejo: {} diff --git a/otc/edp.buildth.ing/stacks/garm/garm.yaml b/otc/edp.buildth.ing/stacks/garm/garm.yaml index ab493b2..1a44c7c 100644 --- a/otc/edp.buildth.ing/stacks/garm/garm.yaml +++ b/otc/edp.buildth.ing/stacks/garm/garm.yaml @@ -20,7 +20,7 @@ spec: sources: - repoURL: https://edp.buildth.ing/DevFW-CICD/garm-helm path: charts/garm - targetRevision: v0.0.7 + targetRevision: v0.0.11 helm: valueFiles: - $values/otc/edp.buildth.ing/stacks/garm/garm/values.yaml diff --git a/otc/edp.buildth.ing/stacks/garm/garm/values.yaml b/otc/edp.buildth.ing/stacks/garm/garm/values.yaml index 7ad8f26..d1a9e79 100644 --- a/otc/edp.buildth.ing/stacks/garm/garm/values.yaml +++ b/otc/edp.buildth.ing/stacks/garm/garm/values.yaml @@ -36,6 +36,9 @@ providerConfig: cloudlet: name: Hamburg organization: TelekomOP + edgeConnectK8s: + sizer: + sidecarImage: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-collector:0.0.4 garm: logging: diff --git a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml b/otc/edp.buildth.ing/stacks/garm/sizer-receiver.yaml similarity index 84% rename from otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml rename to otc/edp.buildth.ing/stacks/garm/sizer-receiver.yaml index 4fd45cf..a382e6a 100644 --- a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml +++ b/otc/edp.buildth.ing/stacks/garm/sizer-receiver.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: optimiser-receiver + name: sizer-receiver namespace: argocd labels: env: dev @@ -22,4 +22,4 @@ spec: source: repoURL: https://observability.buildth.ing/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "otc/edp.buildth.ing/stacks/garm/optimiser-receiver" + path: "otc/edp.buildth.ing/stacks/garm/sizer-receiver" diff --git a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml b/otc/edp.buildth.ing/stacks/garm/sizer-receiver/deployment.yaml similarity index 77% rename from otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml rename to otc/edp.buildth.ing/stacks/garm/sizer-receiver/deployment.yaml index f7e366b..e3c0318 100644 --- a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml +++ b/otc/edp.buildth.ing/stacks/garm/sizer-receiver/deployment.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: optimiser-receiver + name: sizer-receiver labels: - app: optimiser-receiver + app: sizer-receiver spec: replicas: 1 selector: matchLabels: - app: optimiser-receiver + app: sizer-receiver template: metadata: labels: - app: optimiser-receiver + app: sizer-receiver spec: containers: - name: receiver - image: edp.buildth.ing/devfw-cicd/forgejo-runner-optimiser-receiver:0.0.3 + image: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-receiver:0.0.4 args: - --db=/data/metrics.db ports: @@ -27,12 +27,12 @@ spec: - name: RECEIVER_READ_TOKEN valueFrom: secretKeyRef: - name: optimiser-tokens + name: sizer-tokens key: read-token - name: RECEIVER_HMAC_KEY valueFrom: secretKeyRef: - name: optimiser-tokens + name: sizer-tokens key: hmac-key volumeMounts: - name: data @@ -59,17 +59,17 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: optimiser-receiver-data + claimName: sizer-receiver-data --- apiVersion: v1 kind: Service metadata: - name: optimiser-receiver + name: sizer-receiver labels: - app: optimiser-receiver + app: sizer-receiver spec: selector: - app: optimiser-receiver + app: sizer-receiver ports: - name: http port: 8080 @@ -79,9 +79,9 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: optimiser-receiver-data + name: sizer-receiver-data labels: - app: optimiser-receiver + app: sizer-receiver annotations: everest.io/disk-volume-type: GPSSD spec: diff --git a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml b/otc/edp.buildth.ing/stacks/garm/sizer-receiver/ingress.yaml similarity index 69% rename from otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml rename to otc/edp.buildth.ing/stacks/garm/sizer-receiver/ingress.yaml index aa6ac34..3fcc484 100644 --- a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml +++ b/otc/edp.buildth.ing/stacks/garm/sizer-receiver/ingress.yaml @@ -5,22 +5,22 @@ metadata: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: main - name: optimiser-receiver + name: sizer-receiver namespace: garm spec: ingressClassName: nginx rules: - - host: optimiser.edp.buildth.ing + - host: sizer.edp.buildth.ing http: paths: - backend: service: - name: optimiser-receiver + name: sizer-receiver port: number: 8080 path: / pathType: Prefix tls: - hosts: - - optimiser.edp.buildth.ing - secretName: optimiser-receiver-tls + - sizer.edp.buildth.ing + secretName: sizer-receiver-tls