Merge pull request kubernetes#125871 from dims/fix-for-merged-kubelet-config-does-not-match-the-expected-configuration-in-cgroupv1-based-jobs

Fix for Merged kubelet config does not match the expected configuration in cgroupv1 based jobs

Author: k8s-ci-robot

test/e2e_node/kubelet_config_dir_test.go

@@ -169,7 +169,13 @@ featureGates:
 				},
 			}
 			// This covers the case where the fields within the map are overridden.
-			initialConfig.FeatureGates = map[string]bool{"DisableKubeletCloudCredentialProviders": true, "PodAndContainerStatsFromCRI": false, "DynamicResourceAllocation": true}
+			overrides := map[string]bool{"DisableKubeletCloudCredentialProviders": true, "PodAndContainerStatsFromCRI": false, "DynamicResourceAllocation": true}
+			// In some CI jobs, `NodeSwap` is explicitly disabled as the images are cgroupv1 based,
+			// so such flags should be picked up directly from the initial configuration
+			if _, ok := initialConfig.FeatureGates["NodeSwap"]; ok {
+				overrides["NodeSwap"] = initialConfig.FeatureGates["NodeSwap"]
+			}
+			initialConfig.FeatureGates = overrides
 			// Compare the expected config with the merged config
 			gomega.Expect(initialConfig).To(gomega.BeComparableTo(mergedConfig), "Merged kubelet config does not match the expected configuration.")
 		})