From 7eed0cd5f89e7b9254231df071bf7042c566fb99 Mon Sep 17 00:00:00 2001 From: Martin McCaffery Date: Tue, 10 Mar 2026 09:39:08 +0100 Subject: [PATCH] Rename optimiser to sizer --- template/stacks/forgejo/forgejo-server/values.yaml | 2 +- template/stacks/garm/garm.yaml | 2 +- template/stacks/garm/garm/values.yaml | 3 +++ .../{optimiser-receiver.yaml => sizer-receiver.yaml} | 4 ++-- .../deployment.yaml | 0 .../ingress.yaml | 12 ++++++------ 6 files changed, 13 insertions(+), 10 deletions(-) rename template/stacks/garm/{optimiser-receiver.yaml => sizer-receiver.yaml} (91%) rename template/stacks/garm/{optimiser-receiver => sizer-receiver}/deployment.yaml (100%) rename template/stacks/garm/{optimiser-receiver => sizer-receiver}/ingress.yaml (68%) diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml index 96eabd8..1c3ad14 100644 --- a/template/stacks/forgejo/forgejo-server/values.yaml +++ b/template/stacks/forgejo/forgejo-server/values.yaml @@ -177,4 +177,4 @@ image: # rootless: true fullOverride: {{{ getenv "CLIENT_REPO_DOMAIN" }}}/devfw-cicd/edp-forgejo:{{{ .Env.FORGEJO_IMAGE_TAG }}} -forgejo: {} \ No newline at end of file +forgejo: {} diff --git a/template/stacks/garm/garm.yaml b/template/stacks/garm/garm.yaml index 718ffa5..705a5c7 100644 --- a/template/stacks/garm/garm.yaml +++ b/template/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/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/garm/garm/values.yaml diff --git a/template/stacks/garm/garm/values.yaml b/template/stacks/garm/garm/values.yaml index 7def2ff..78fa34f 100644 --- a/template/stacks/garm/garm/values.yaml +++ b/template/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/template/stacks/garm/optimiser-receiver.yaml b/template/stacks/garm/sizer-receiver.yaml similarity index 91% rename from template/stacks/garm/optimiser-receiver.yaml rename to template/stacks/garm/sizer-receiver.yaml index a08d586..06fb027 100644 --- a/template/stacks/garm/optimiser-receiver.yaml +++ b/template/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://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}} targetRevision: HEAD - path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/garm/optimiser-receiver" + path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/garm/sizer-receiver" diff --git a/template/stacks/garm/optimiser-receiver/deployment.yaml b/template/stacks/garm/sizer-receiver/deployment.yaml similarity index 100% rename from template/stacks/garm/optimiser-receiver/deployment.yaml rename to template/stacks/garm/sizer-receiver/deployment.yaml diff --git a/template/stacks/garm/optimiser-receiver/ingress.yaml b/template/stacks/garm/sizer-receiver/ingress.yaml similarity index 68% rename from template/stacks/garm/optimiser-receiver/ingress.yaml rename to template/stacks/garm/sizer-receiver/ingress.yaml index 067d2a6..d57432b 100644 --- a/template/stacks/garm/optimiser-receiver/ingress.yaml +++ b/template/stacks/garm/sizer-receiver/ingress.yaml @@ -6,25 +6,25 @@ metadata: cert-manager.io/cluster-issuer: main {{{ if eq .Env.CLUSTER_TYPE "osc" }}} dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: optimiser.{{{ .Env.DOMAIN }}} + dns.gardener.cloud/dnsnames: sizer.{{{ .Env.DOMAIN }}} dns.gardener.cloud/ttl: "600" {{{ end }}} - name: optimiser-receiver + name: sizer-receiver namespace: garm spec: ingressClassName: nginx rules: - - host: optimiser.{{{ .Env.DOMAIN }}} + - host: sizer.{{{ .Env.DOMAIN }}} http: paths: - backend: service: - name: optimiser-receiver + name: sizer-receiver port: number: 8080 path: / pathType: Prefix tls: - hosts: - - optimiser.{{{ .Env.DOMAIN }}} - secretName: optimiser-receiver-tls + - sizer.{{{ .Env.DOMAIN }}} + secretName: sizer-receiver-tls