github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix for Merged kubelet config does not match the expected configuration in cgroupv1 based jobs
This commit is contained in:
Kubernetes Prow Robot 2024-07-03 08:58:32 -07:00 committed by GitHub
commit 0d3b859af8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e_node/kubelet_config_dir_test.go
View File

@ -169,7 +169,13 @@ featureGates:
}, },
} }
// This covers the case where the fields within the map are overridden. // 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 // Compare the expected config with the merged config
gomega.Expect(initialConfig).To(gomega.BeComparableTo(mergedConfig), "Merged kubelet config does not match the expected configuration.") gomega.Expect(initialConfig).To(gomega.BeComparableTo(mergedConfig), "Merged kubelet config does not match the expected configuration.")
}) })