mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 05:57:25 +00:00
Merge pull request #130858 from dims/trying-to-fix-provider-kubelet_config_dir_test
Fix kubelet_config_dir_test after KubeletServiceAccountTokenForCredentialProviders was added
This commit is contained in:
commit
f8cc9c92d6
@ -118,6 +118,7 @@ shutdownGracePeriodByPodPriority:
|
|||||||
- priority: 6
|
- priority: 6
|
||||||
shutdownGracePeriodSeconds: 30
|
shutdownGracePeriodSeconds: 30
|
||||||
featureGates:
|
featureGates:
|
||||||
|
KubeletServiceAccountTokenForCredentialProviders: true
|
||||||
PodAndContainerStatsFromCRI: false
|
PodAndContainerStatsFromCRI: false
|
||||||
DynamicResourceAllocation: true`)
|
DynamicResourceAllocation: true`)
|
||||||
framework.ExpectNoError(os.WriteFile(filepath.Join(configDir, "20-kubelet.conf"), contents, 0755))
|
framework.ExpectNoError(os.WriteFile(filepath.Join(configDir, "20-kubelet.conf"), contents, 0755))
|
||||||
@ -163,7 +164,11 @@ 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.
|
||||||
overrides := map[string]bool{"PodAndContainerStatsFromCRI": false, "DynamicResourceAllocation": true}
|
overrides := map[string]bool{
|
||||||
|
"PodAndContainerStatsFromCRI": false,
|
||||||
|
"DynamicResourceAllocation": true,
|
||||||
|
"KubeletServiceAccountTokenForCredentialProviders": true,
|
||||||
|
}
|
||||||
// In some CI jobs, `NodeSwap` is explicitly disabled as the images are cgroupv1 based,
|
// 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
|
// so such flags should be picked up directly from the initial configuration
|
||||||
if _, ok := initialConfig.FeatureGates["NodeSwap"]; ok {
|
if _, ok := initialConfig.FeatureGates["NodeSwap"]; ok {
|
||||||
|
Loading…
Reference in New Issue
Block a user