From 4.21 AutoSizingReserved set to true for new clusters

Author: ngopalak-redhat

pkg/controller/kubelet-config/helpers.go

@@ -42,7 +42,7 @@ func createNewKubeletDynamicSystemReservedIgnition(autoSystemReserved *bool, use
 	var systemReservedEphemeralStorage string
 
 	if autoSystemReserved == nil {
-		autoNodeSizing = "false"
+		autoNodeSizing = "true"
 	} else {
 		autoNodeSizing = strconv.FormatBool(*autoSystemReserved)
 	}

pkg/controller/kubelet-config/helpers_test.go

@@ -0,0 +1,87 @@
+package kubeletconfig
+
+import (
+	"strings"
+	"testing"
+
+	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
+)
+
+func TestCreateNewKubeletDynamicSystemReservedIgnition(t *testing.T) {
+	tests := []struct {
+		name                string
+		autoSystemReserved  *bool
+		expectedAutoSizing  string
+		expectedMemory      string
+		expectedCPU         string
+		expectedEphemeral   string
+	}{
+		{
+			name:                "Auto sizing should be true if autoSystemReserved is passed as nil",
+			autoSystemReserved:  nil,
+			expectedAutoSizing:  "NODE_SIZING_ENABLED=true",
+			expectedMemory:      "SYSTEM_RESERVED_MEMORY=1Gi",
+			expectedCPU:         "SYSTEM_RESERVED_CPU=500m",
+			expectedEphemeral:   "SYSTEM_RESERVED_ES=1Gi",
+		},
+		{
+			name:                "Auto sizing should be false if autoSystemReserved is passed as false",
+			autoSystemReserved:  boolPtr(false),
+			expectedAutoSizing:  "NODE_SIZING_ENABLED=false",
+			expectedMemory:      "SYSTEM_RESERVED_MEMORY=1Gi",
+			expectedCPU:         "SYSTEM_RESERVED_CPU=500m",
+			expectedEphemeral:   "SYSTEM_RESERVED_ES=1Gi",
+		},
+		{
+			name:                "Auto sizing should be true if autoSystemReserved is passed as true",
+			autoSystemReserved:  boolPtr(true),
+			expectedAutoSizing:  "NODE_SIZING_ENABLED=true",
+			expectedMemory:      "SYSTEM_RESERVED_MEMORY=1Gi",
+			expectedCPU:         "SYSTEM_RESERVED_CPU=500m",
+			expectedEphemeral:   "SYSTEM_RESERVED_ES=1Gi",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Call the function with nil for userDefinedSystemReserved as requested
+			result := createNewKubeletDynamicSystemReservedIgnition(tt.autoSystemReserved, nil)
+
+			// Verify the file path is correct
+			expectedPath := "/etc/node-sizing-enabled.env"
+			if result.Path != expectedPath {
+				t.Errorf("Expected path %s, got %s", expectedPath, result.Path)
+			}
+
+			// Decode the file contents
+			contents, err := ctrlcommon.DecodeIgnitionFileContents(result.Contents.Source, result.Contents.Compression)
+			if err != nil {
+				t.Fatalf("Failed to decode ignition file contents: %v", err)
+			}
+
+			contentsStr := string(contents)
+
+			// Verify each expected line is in the contents
+			if !strings.Contains(contentsStr, tt.expectedAutoSizing) {
+				t.Errorf("Expected contents to contain %q, but got: %s", tt.expectedAutoSizing, contentsStr)
+			}
+
+			if !strings.Contains(contentsStr, tt.expectedMemory) {
+				t.Errorf("Expected contents to contain %q, but got: %s", tt.expectedMemory, contentsStr)
+			}
+
+			if !strings.Contains(contentsStr, tt.expectedCPU) {
+				t.Errorf("Expected contents to contain %q, but got: %s", tt.expectedCPU, contentsStr)
+			}
+
+			if !strings.Contains(contentsStr, tt.expectedEphemeral) {
+				t.Errorf("Expected contents to contain %q, but got: %s", tt.expectedEphemeral, contentsStr)
+			}
+		})
+	}
+}
+
+// boolPtr is a helper function to get a pointer to a bool value
+func boolPtr(b bool) *bool {
+	return &b
+}

pkg/controller/template/template_controller_test.go

@@ -3,6 +3,7 @@ package template
 import (
 	"fmt"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 
@@ -448,3 +449,60 @@ func getKey(config *mcfgv1.ControllerConfig, t *testing.T) string {
 	}
 	return key
 }
+
+func TestKubeletAutoNodeSizingEnabled(t *testing.T) {
+	cc := newControllerConfig("test-cluster")
+	ps := []byte(`{"dummy": "dummy"}`)
+
+	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, ps, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Find machine configs that should contain the auto-node-sizing file
+	// The file should be in all role-based machine configs (master, worker)
+	autoSizingFileFound := false
+	for _, mc := range mcs {
+		ignCfg, err := ctrlcommon.ParseAndConvertConfig(mc.Spec.Config.Raw)
+		if err != nil {
+			t.Fatalf("Failed to parse ignition config for %s: %v", mc.Name, err)
+		}
+
+		// Look for the auto-node-sizing file
+		for _, file := range ignCfg.Storage.Files {
+			if file.Path == "/etc/node-sizing-enabled.env" {
+				autoSizingFileFound = true
+
+				// Decode the file contents
+				contents, err := ctrlcommon.DecodeIgnitionFileContents(file.Contents.Source, file.Contents.Compression)
+				if err != nil {
+					t.Fatalf("Failed to decode auto-node-sizing file contents: %v", err)
+				}
+
+				contentsStr := string(contents)
+
+				// Verify NODE_SIZING_ENABLED=true is present
+				if !strings.Contains(contentsStr, "NODE_SIZING_ENABLED=true") {
+					t.Errorf("Expected NODE_SIZING_ENABLED=true in %s, got: %s", mc.Name, contentsStr)
+				}
+
+				// Verify other expected values
+				if !strings.Contains(contentsStr, "SYSTEM_RESERVED_MEMORY=1Gi") {
+					t.Errorf("Expected SYSTEM_RESERVED_MEMORY=1Gi in %s, got: %s", mc.Name, contentsStr)
+				}
+
+				if !strings.Contains(contentsStr, "SYSTEM_RESERVED_CPU=500m") {
+					t.Errorf("Expected SYSTEM_RESERVED_CPU=500m in %s, got: %s", mc.Name, contentsStr)
+				}
+
+				if !strings.Contains(contentsStr, "SYSTEM_RESERVED_ES=1Gi") {
+					t.Errorf("Expected SYSTEM_RESERVED_ES=1Gi in %s, got: %s", mc.Name, contentsStr)
+				}
+			}
+		}
+	}
+
+	if !autoSizingFileFound {
+		t.Error("Expected to find /etc/node-sizing-enabled.env file in at least one machine config")
+	}
+}

templates/common/_base/files/kubelet-auto-node-sizing-enabled.yaml

@@ -2,7 +2,7 @@ mode: 0644
 path: "/etc/node-sizing-enabled.env"
 contents:
   inline: |
-    NODE_SIZING_ENABLED=false
+    NODE_SIZING_ENABLED=true
     SYSTEM_RESERVED_MEMORY=1Gi
     SYSTEM_RESERVED_CPU=500m
     SYSTEM_RESERVED_ES=1Gi