diff --git a/otc/dev.t09.de/registry/ci-sizer.yaml b/otc/dev.t09.de/registry/ci-sizer.yaml deleted file mode 100644 index 58df27e..0000000 --- a/otc/dev.t09.de/registry/ci-sizer.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: ci-sizer-reg - namespace: argocd - labels: - env: dev - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - name: in-cluster - namespace: argocd - source: - path: "otc/dev.t09.de/stacks/ci-sizer" - repoURL: "https://edp.buildth.ing/DevFW-CICD/stacks-instances" - targetRevision: HEAD - project: default - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true diff --git a/otc/dev.t09.de/stacks/core/dex/values.yaml b/otc/dev.t09.de/stacks/core/dex/values.yaml index c3e842a..8a2a79d 100644 --- a/otc/dev.t09.de/stacks/core/dex/values.yaml +++ b/otc/dev.t09.de/stacks/core/dex/values.yaml @@ -34,11 +34,6 @@ envVars: secretKeyRef: name: dex-argo-client key: clientSecret - - name: FORGEJO_RUNNER_SIZER_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: dex-runner-sizer-client - key: clientSecret - name: LOG_LEVEL value: debug @@ -79,8 +74,3 @@ config: - "https://grafana.dev.t09.de/login/generic_oauth" name: "Grafana" secretEnv: "OIDC_DEX_GRAFANA_CLIENT_SECRET" - - id: ci-sizer - name: "CI Sizer" - redirectURIs: - - "https://sizer.dev.t09.de/ui/callback" - secretEnv: "FORGEJO_RUNNER_SIZER_CLIENT_SECRET" diff --git a/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml b/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml index ec901a0..4c35c43 100644 --- a/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/dev.t09.de/stacks/forgejo/forgejo-server/values.yaml @@ -137,9 +137,6 @@ gitea: ENABLED: true ADAPTER: redis - security: - GLOBAL_TWO_FACTOR_REQUIREMENT: admin - service: DISABLE_REGISTRATION: true ENABLE_NOTIFY_MAIL: true diff --git a/otc/dev.t09.de/stacks/garm/garm.yaml b/otc/dev.t09.de/stacks/garm/garm.yaml index 3754f9a..43c7d4e 100644 --- a/otc/dev.t09.de/stacks/garm/garm.yaml +++ b/otc/dev.t09.de/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.15 + targetRevision: v0.0.12 helm: valueFiles: - $values/otc/dev.t09.de/stacks/garm/garm/values.yaml diff --git a/otc/dev.t09.de/stacks/garm/garm/values.yaml b/otc/dev.t09.de/stacks/garm/garm/values.yaml index e1ee11d..eebfcf1 100644 --- a/otc/dev.t09.de/stacks/garm/garm/values.yaml +++ b/otc/dev.t09.de/stacks/garm/garm/values.yaml @@ -26,7 +26,7 @@ credentials: image: repository: edp.buildth.ing/devfw-cicd/garm-forgejo - tag: v0.1.7-forgejo-22 + tag: v0.1.7-forgejo-3 providerConfig: edgeConnect: @@ -37,9 +37,8 @@ providerConfig: name: Hamburg organization: TelekomOP edgeConnectK8s: - pendingTimeout: "5m" sizer: - sidecarImage: edp.buildth.ing/devfw-cicd/ci-sizer-collector:latest + sidecarImage: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-collector:latest sidecarPushEndpoint: https://sizer.dev.t09.de/api/v1/metrics baseUrl: "https://sizer.dev.t09.de" readToken: diff --git a/otc/dev.t09.de/stacks/ci-sizer/sizer-receiver.yaml b/otc/dev.t09.de/stacks/garm/sizer-receiver.yaml similarity index 85% rename from otc/dev.t09.de/stacks/ci-sizer/sizer-receiver.yaml rename to otc/dev.t09.de/stacks/garm/sizer-receiver.yaml index 4f1b6bc..1425cc6 100644 --- a/otc/dev.t09.de/stacks/ci-sizer/sizer-receiver.yaml +++ b/otc/dev.t09.de/stacks/garm/sizer-receiver.yaml @@ -18,8 +18,8 @@ spec: limit: -1 destination: name: in-cluster - namespace: ci-sizer + namespace: garm source: repoURL: https://edp.buildth.ing/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "otc/dev.t09.de/stacks/ci-sizer/sizer-receiver" + path: "otc/dev.t09.de/stacks/garm/sizer-receiver" diff --git a/otc/edp.buildth.ing/stacks/garm/sizer-receiver/deployment.yaml b/otc/dev.t09.de/stacks/garm/sizer-receiver/deployment.yaml similarity index 90% rename from otc/edp.buildth.ing/stacks/garm/sizer-receiver/deployment.yaml rename to otc/dev.t09.de/stacks/garm/sizer-receiver/deployment.yaml index 2d3eeaa..91a1049 100644 --- a/otc/edp.buildth.ing/stacks/garm/sizer-receiver/deployment.yaml +++ b/otc/dev.t09.de/stacks/garm/sizer-receiver/deployment.yaml @@ -5,6 +5,8 @@ metadata: labels: app: sizer-receiver spec: + strategy: + type: Recreate replicas: 1 selector: matchLabels: @@ -16,7 +18,8 @@ spec: spec: containers: - name: receiver - image: edp.buildth.ing/devfw-cicd/ci-sizer-receiver:0.0.4 + image: edp.buildth.ing/devfw-cicd/forgejo-runner-sizer-receiver:latest + imagePullPolicy: Always args: - --db=/data/metrics.db ports: @@ -34,10 +37,6 @@ spec: secretKeyRef: name: sizer-tokens key: hmac-key - - name: RECEIVER_CPU_SIZING_MODE - value: "observe" - - name: RECEIVER_MEMORY_QOS - value: "guaranteed" volumeMounts: - name: data mountPath: /data diff --git a/otc/dev.t09.de/stacks/ci-sizer/sizer-receiver/ingress.yaml b/otc/dev.t09.de/stacks/garm/sizer-receiver/ingress.yaml similarity index 96% rename from otc/dev.t09.de/stacks/ci-sizer/sizer-receiver/ingress.yaml rename to otc/dev.t09.de/stacks/garm/sizer-receiver/ingress.yaml index 9a28977..bc50d98 100644 --- a/otc/dev.t09.de/stacks/ci-sizer/sizer-receiver/ingress.yaml +++ b/otc/dev.t09.de/stacks/garm/sizer-receiver/ingress.yaml @@ -6,7 +6,7 @@ metadata: cert-manager.io/cluster-issuer: main name: sizer-receiver - namespace: ci-sizer + namespace: garm spec: ingressClassName: nginx rules: 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 c9e7a8a..2b64cca 100644 --- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml @@ -137,9 +137,6 @@ gitea: ENABLED: true ADAPTER: redis - security: - GLOBAL_TWO_FACTOR_REQUIREMENT: admin - service: DISABLE_REGISTRATION: true ENABLE_NOTIFY_MAIL: true @@ -180,4 +177,4 @@ image: # rootless: true fullOverride: observability.buildth.ing/devfw-cicd/edp-forgejo:14.0.2-edp1-rootless -forgejo: {} +forgejo: {} \ No newline at end of file diff --git a/otc/edp.buildth.ing/stacks/garm/garm.yaml b/otc/edp.buildth.ing/stacks/garm/garm.yaml index 1a44c7c..ab493b2 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.11 + targetRevision: v0.0.7 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 7c4eccc..7ad8f26 100644 --- a/otc/edp.buildth.ing/stacks/garm/garm/values.yaml +++ b/otc/edp.buildth.ing/stacks/garm/garm/values.yaml @@ -26,7 +26,7 @@ credentials: image: repository: observability.buildth.ing/devfw-cicd/garm-forgejo - tag: v0.1.7-forgejo-21 + tag: v0.1.7-forgejo-1 providerConfig: edgeConnect: @@ -36,9 +36,6 @@ providerConfig: cloudlet: name: Hamburg organization: TelekomOP - edgeConnectK8s: - sizer: - sidecarImage: edp.buildth.ing/devfw-cicd/ci-sizer-collector:0.0.4 garm: logging: diff --git a/otc/edp.buildth.ing/stacks/garm/sizer-receiver.yaml b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml similarity index 84% rename from otc/edp.buildth.ing/stacks/garm/sizer-receiver.yaml rename to otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml index a382e6a..4fd45cf 100644 --- a/otc/edp.buildth.ing/stacks/garm/sizer-receiver.yaml +++ b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: sizer-receiver + name: optimiser-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/sizer-receiver" + path: "otc/edp.buildth.ing/stacks/garm/optimiser-receiver" diff --git a/otc/dev.t09.de/stacks/ci-sizer/sizer-receiver/deployment.yaml b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml similarity index 51% rename from otc/dev.t09.de/stacks/ci-sizer/sizer-receiver/deployment.yaml rename to otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml index dd918d5..f7e366b 100644 --- a/otc/dev.t09.de/stacks/ci-sizer/sizer-receiver/deployment.yaml +++ b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml @@ -1,27 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: sizer-receiver + name: optimiser-receiver labels: - app: sizer-receiver + app: optimiser-receiver spec: - strategy: - type: Recreate replicas: 1 selector: matchLabels: - app: sizer-receiver + app: optimiser-receiver template: metadata: labels: - app: sizer-receiver + app: optimiser-receiver spec: - securityContext: - fsGroup: 65534 containers: - name: receiver - image: edp.buildth.ing/devfw-cicd/ci-sizer-receiver:latest - imagePullPolicy: Always + image: edp.buildth.ing/devfw-cicd/forgejo-runner-optimiser-receiver:0.0.3 args: - --db=/data/metrics.db ports: @@ -32,41 +27,13 @@ spec: - name: RECEIVER_READ_TOKEN valueFrom: secretKeyRef: - name: sizer-tokens + name: optimiser-tokens key: read-token - name: RECEIVER_HMAC_KEY valueFrom: secretKeyRef: - name: sizer-tokens + name: optimiser-tokens key: hmac-key - - name: GARM_URL - value: "http://garm.garm.svc.cluster.local:80" - - name: GARM_USER - value: "admin" - - name: GARM_PASSWORD - valueFrom: - secretKeyRef: - name: garm-fixed-credentials - key: admin_password - - name: RECEIVER_OIDC_ISSUER - value: "https://dex.dev.t09.de" - - name: RECEIVER_OIDC_CLIENT_ID - value: "ci-sizer" - - name: RECEIVER_OIDC_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: sizer-oidc-client - key: client-secret - - name: RECEIVER_OIDC_REDIRECT_URI - value: "https://sizer.dev.t09.de/ui/callback" - - name: RECEIVER_SESSION_TTL - value: "12h" - - name: RECEIVER_ALLOWED_ORG - value: "DevFW" - - name: RECEIVER_CPU_SIZING_MODE - value: "observe" - - name: RECEIVER_MEMORY_QOS - value: "guaranteed" volumeMounts: - name: data mountPath: /data @@ -92,17 +59,17 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: sizer-receiver-data + claimName: optimiser-receiver-data --- apiVersion: v1 kind: Service metadata: - name: sizer-receiver + name: optimiser-receiver labels: - app: sizer-receiver + app: optimiser-receiver spec: selector: - app: sizer-receiver + app: optimiser-receiver ports: - name: http port: 8080 @@ -112,9 +79,9 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: sizer-receiver-data + name: optimiser-receiver-data labels: - app: sizer-receiver + app: optimiser-receiver annotations: everest.io/disk-volume-type: GPSSD spec: diff --git a/otc/edp.buildth.ing/stacks/garm/sizer-receiver/ingress.yaml b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml similarity index 69% rename from otc/edp.buildth.ing/stacks/garm/sizer-receiver/ingress.yaml rename to otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml index 3fcc484..aa6ac34 100644 --- a/otc/edp.buildth.ing/stacks/garm/sizer-receiver/ingress.yaml +++ b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml @@ -5,22 +5,22 @@ metadata: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: main - name: sizer-receiver + name: optimiser-receiver namespace: garm spec: ingressClassName: nginx rules: - - host: sizer.edp.buildth.ing + - host: optimiser.edp.buildth.ing http: paths: - backend: service: - name: sizer-receiver + name: optimiser-receiver port: number: 8080 path: / pathType: Prefix tls: - hosts: - - sizer.edp.buildth.ing - secretName: sizer-receiver-tls + - optimiser.edp.buildth.ing + secretName: optimiser-receiver-tls diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..7190a60 --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json" +}