From fa56a22b2fa74e17e109205d91c423986a734043 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 5 Feb 2025 16:34:47 +0100 Subject: [PATCH] fix(chart): set `divisor` for `resourceFieldRef`s They are all set to one, based on the Kubernetes documentation[1] that states: > The `divisor` field is optional and has the default value of `1`. > A divisor of `1` means cores for cpu resources, or bytes for memory > resources. [1]: https://kubernetes.io/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/#store-container-fields Signed-off-by: Hidde Beydals --- charts/kargo/templates/api/deployment.yaml | 2 ++ charts/kargo/templates/controller/deployment.yaml | 2 ++ charts/kargo/templates/dex-server/deployment.yaml | 2 ++ charts/kargo/templates/garbage-collector/cron-job.yaml | 2 ++ charts/kargo/templates/management-controller/deployment.yaml | 2 ++ charts/kargo/templates/webhooks-server/deployment.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/charts/kargo/templates/api/deployment.yaml b/charts/kargo/templates/api/deployment.yaml index b0c744d65..ea3549de6 100644 --- a/charts/kargo/templates/api/deployment.yaml +++ b/charts/kargo/templates/api/deployment.yaml @@ -64,11 +64,13 @@ spec: valueFrom: resourceFieldRef: containerName: api + divisor: "1" resource: limits.memory - name: GOMAXPROCS valueFrom: resourceFieldRef: containerName: api + divisor: "1" resource: limits.cpu {{- with (concat .Values.global.env .Values.api.env) }} {{- toYaml . | nindent 10 }} diff --git a/charts/kargo/templates/controller/deployment.yaml b/charts/kargo/templates/controller/deployment.yaml index 5e7c7c448..4d85f99d6 100644 --- a/charts/kargo/templates/controller/deployment.yaml +++ b/charts/kargo/templates/controller/deployment.yaml @@ -64,11 +64,13 @@ spec: valueFrom: resourceFieldRef: containerName: controller + divisor: "1" resource: limits.memory - name: GOMAXPROCS valueFrom: resourceFieldRef: containerName: controller + divisor: "1" resource: limits.cpu {{- with (concat .Values.global.env .Values.controller.env) }} {{- toYaml . | nindent 8 }} diff --git a/charts/kargo/templates/dex-server/deployment.yaml b/charts/kargo/templates/dex-server/deployment.yaml index 59f0306e7..0a6fc0eec 100644 --- a/charts/kargo/templates/dex-server/deployment.yaml +++ b/charts/kargo/templates/dex-server/deployment.yaml @@ -47,11 +47,13 @@ spec: valueFrom: resourceFieldRef: containerName: dex-server + divisor: "1" resource: limits.memory - name: GOMAXPROCS valueFrom: resourceFieldRef: containerName: dex-server + divisor: "1" resource: limits.cpu {{- with (concat .Values.global.env .Values.api.oidc.dex.env) }} {{- toYaml . | nindent 8 }} diff --git a/charts/kargo/templates/garbage-collector/cron-job.yaml b/charts/kargo/templates/garbage-collector/cron-job.yaml index 0943061c5..c2c1b0243 100644 --- a/charts/kargo/templates/garbage-collector/cron-job.yaml +++ b/charts/kargo/templates/garbage-collector/cron-job.yaml @@ -63,11 +63,13 @@ spec: valueFrom: resourceFieldRef: containerName: garbage-collector + divisor: "1" resource: limits.memory - name: GOMAXPROCS valueFrom: resourceFieldRef: containerName: garbage-collector + divisor: "1" resource: limits.cpu {{- with (concat .Values.global.env .Values.garbageCollector.env) }} {{- toYaml . | nindent 12 }} diff --git a/charts/kargo/templates/management-controller/deployment.yaml b/charts/kargo/templates/management-controller/deployment.yaml index b0f39f671..cf8123dd2 100644 --- a/charts/kargo/templates/management-controller/deployment.yaml +++ b/charts/kargo/templates/management-controller/deployment.yaml @@ -64,11 +64,13 @@ spec: valueFrom: resourceFieldRef: containerName: management-controller + divisor: "1" resource: limits.memory - name: GOMAXPROCS valueFrom: resourceFieldRef: containerName: management-controller + divisor: "1" resource: limits.cpu {{- with (concat .Values.global.env .Values.managementController.env) }} {{- toYaml . | nindent 8 }} diff --git a/charts/kargo/templates/webhooks-server/deployment.yaml b/charts/kargo/templates/webhooks-server/deployment.yaml index ffde69802..cd7b8ad1c 100644 --- a/charts/kargo/templates/webhooks-server/deployment.yaml +++ b/charts/kargo/templates/webhooks-server/deployment.yaml @@ -64,11 +64,13 @@ spec: valueFrom: resourceFieldRef: containerName: webhooks-server + divisor: "1" resource: limits.memory - name: GOMAXPROCS valueFrom: resourceFieldRef: containerName: webhooks-server + divisor: "1" resource: limits.cpu {{- with (concat .Values.global.env .Values.webhooksServer.env) }} {{- toYaml . | nindent 8 }}