Merge branch 'master' into singularity_release

Azure · Aug 19, 2024 · 8b76671 · 8b76671
2 parents a42a04f + 3021435
commit 8b76671
Show file tree

Hide file tree

Showing 59 changed files with 0 additions and 7,571 deletions.
diff --git a/pkg/agent/baker_test.go b/pkg/agent/baker_test.go
@@ -1245,19 +1245,6 @@ oom_score = 0
 			Expect(strings.Contains(o.vars["KUBELET_FLAGS"], "--image-credential-provider-config=/var/lib/kubelet/credential-provider-config.yaml")).To(BeTrue())
 			Expect(strings.Contains(o.vars["KUBELET_FLAGS"], "--image-credential-provider-bin-dir=/var/lib/kubelet/credential-provider")).To(BeTrue())
 		}),
-		Entry("AKSUbuntu2204 with SerializeImagePulls=false and k8s 1.31", "AKSUbuntu2204+SerializeImagePulls", "1.31.0", func(config *datamodel.NodeBootstrappingConfiguration) {
-			config.KubeletConfig["--serialize-image-pulls"] = "false"
-		}, func(o *nodeBootstrappingOutput) {
-			Expect(o.vars["KUBELET_FLAGS"]).NotTo(BeEmpty())
-			Expect(strings.Contains(o.vars["KUBELET_FLAGS"], "--serialize-image-pulls=false")).To(BeTrue())
-		}),
-		Entry("AKSUbuntu2204 with no serializeImagePull in kubelet flag", "AKSUbuntu2204+NoSerializeImagePulls", "1.29.0", func(config *datamodel.NodeBootstrappingConfiguration) {
-			// for k8s < 1.31, this will never happen but adding a case where it is set somehow, we should skip that in KUBELET_FLAGS
-			config.KubeletConfig["--serialize-image-pulls"] = "false"
-		}, func(o *nodeBootstrappingOutput) {
-			Expect(o.vars["KUBELET_FLAGS"]).NotTo(BeEmpty())
-			Expect(strings.Contains(o.vars["KUBELET_FLAGS"], "--serialize-image-pulls")).To(BeFalse())
-		}),
 		Entry("AKSUbuntu2204 custom cloud and OOT credentialprovider", "AKSUbuntu2204+CustomCloud+ootcredentialprovider", "1.29.10",
 			func(config *datamodel.NodeBootstrappingConfiguration) {
 				config.ContainerService.Properties.CustomCloudEnv = &datamodel.CustomCloudEnv{

diff --git a/pkg/agent/testdata/AKSUbuntu2204+NoSerializeImagePulls/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+NoSerializeImagePulls/CSECommand