Merge pull request #55 from syseleven/kubeletconfig-imagegc

K8s-9602 Kubelet image GC settings configurable
syseleven · Mar 7, 2024 · 3320a58 · 3320a58
2 parents b332154 + 7eb9759
commit 3320a58
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/pkg/apis/cluster/common/consts.go b/pkg/apis/cluster/common/consts.go
@@ -135,12 +135,14 @@ const (
 )
 
 const (
-	SystemReservedKubeletConfig       = "SystemReserved"
-	KubeReservedKubeletConfig         = "KubeReserved"
-	EvictionHardKubeletConfig         = "EvictionHard"
-	ContainerLogMaxSizeKubeletConfig  = "ContainerLogMaxSize"
-	ContainerLogMaxFilesKubeletConfig = "ContainerLogMaxFiles"
-	MaxPodsKubeletConfig              = "MaxPods"
+	SystemReservedKubeletConfig              = "SystemReserved"
+	KubeReservedKubeletConfig                = "KubeReserved"
+	EvictionHardKubeletConfig                = "EvictionHard"
+	ContainerLogMaxSizeKubeletConfig         = "ContainerLogMaxSize"
+	ContainerLogMaxFilesKubeletConfig        = "ContainerLogMaxFiles"
+	MaxPodsKubeletConfig                     = "MaxPods"
+	ImageGCLowThresholdPercentKubeletConfig  = "ImageGCLowThresholdPercent"
+	ImageGCHighThresholdPercentKubeletConfig = "ImageGCHighThresholdPercent"
 )
 
 const (

diff --git a/pkg/userdata/helper/kubelet.go b/pkg/userdata/helper/kubelet.go
@@ -295,6 +295,28 @@ func kubeletConfiguration(log *zap.SugaredLogger, clusterDomain string, clusterD
 		}
 	}
 
+	if imgGcLowThreshold, ok := kubeletConfigs[common.ImageGCLowThresholdPercentKubeletConfig]; ok {
+		val, err := strconv.ParseInt(imgGcLowThreshold, 10, 32)
+		if err != nil || val < 0 || val > 100 {
+			// Instead of breaking the workflow, just print a warning and skip the configuration
+			log.Info("Skipping invalid ImageGCLowThresholdPercent value for Kubelet configuration", "value", imgGcLowThreshold)
+		} else {
+			i32val := int32(val)
+			cfg.ImageGCLowThresholdPercent = &i32val
+		}
+	}
+
+	if imgGcHighThreshold, ok := kubeletConfigs[common.ImageGCHighThresholdPercentKubeletConfig]; ok {
+		val, err := strconv.ParseInt(imgGcHighThreshold, 10, 32)
+		if err != nil || val < 0 || val > 100 {
+			// Instead of breaking the workflow, just print a warning and skip the configuration
+			log.Info("Skipping invalid ImageGCHighThresholdPercent value for Kubelet configuration", "value", imgGcHighThreshold)
+		} else {
+			i32val := int32(val)
+			cfg.ImageGCHighThresholdPercent = &i32val
+		}
+	}
+
 	if enabled, ok := featureGates["SeccompDefault"]; ok && enabled {
 		cfg.SeccompDefault = ptr.To(true)
 	}