From 950debfe4a715fe270043463e3047b957157b66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Wed, 13 Dec 2023 17:45:07 +0100 Subject: [PATCH] Use env to determine cluster name used by OpenStack CCM and CSI, increase memory limits and requests for cluster-autoscaler (#2978) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use env to determine cluster name used by OpenStack CCM and CSI Signed-off-by: Marko Mudrinić * Increase memory requests and limits for cluster-autoscaler Signed-off-by: Marko Mudrinić --------- Signed-off-by: Marko Mudrinić --- addons/cluster-autoscaler/cluster-autoscaler.yaml | 4 ++-- pkg/tasks/probes.go | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/cluster-autoscaler/cluster-autoscaler.yaml b/addons/cluster-autoscaler/cluster-autoscaler.yaml index 921a048ea..37d150378 100644 --- a/addons/cluster-autoscaler/cluster-autoscaler.yaml +++ b/addons/cluster-autoscaler/cluster-autoscaler.yaml @@ -189,10 +189,10 @@ spec: resources: limits: cpu: 100m - memory: 300Mi + memory: 600Mi requests: cpu: 100m - memory: 300Mi + memory: 600Mi serviceAccountName: cluster-autoscaler terminationGracePeriodSeconds: 10 tolerations: diff --git a/pkg/tasks/probes.go b/pkg/tasks/probes.go index 6eeb0060f..15b01fa66 100644 --- a/pkg/tasks/probes.go +++ b/pkg/tasks/probes.go @@ -941,7 +941,14 @@ func detectClusterName(s *state.State) (string, error) { } for _, flag := range container.Command { if strings.HasPrefix(flag, "--cluster-name") { - return strings.Split(flag, "=")[1], nil + if val := strings.Split(flag, "=")[1]; val != "$(CLUSTER_NAME)" { + return val, nil + } + } + } + for _, env := range container.Env { + if env.Name == "CLUSTER_NAME" { + return env.Value, nil } } }