Use env to determine cluster name used by OpenStack CCM and CSI, incr…

…ease memory limits and requests for cluster-autoscaler (#2978) * Use env to determine cluster name used by OpenStack CCM and CSI Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> * Increase memory requests and limits for cluster-autoscaler Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> --------- Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
kubermatic · Dec 13, 2023 · 950debf · 950debf
1 parent bb5808b
commit 950debf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
 			}
 		}
 	}