Skip to content

Commit 4e093e0

Browse files
djslyCopilot
andauthored
fix: strip --pod-infra-container-image for Kubernetes >= 1.35 (#8273)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 911e389 commit 4e093e0

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

e2e/node_config.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ func baseKubeletConfig() *aksnodeconfigv1.KubeletConfig {
2121
return &aksnodeconfigv1.KubeletConfig{
2222
EnableKubeletConfigFile: true,
2323
KubeletFlags: map[string]string{
24-
"--cloud-provider": "external",
25-
"--kubeconfig": "/var/lib/kubelet/kubeconfig",
26-
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.6",
24+
"--cloud-provider": "external",
25+
"--kubeconfig": "/var/lib/kubelet/kubeconfig",
2726
},
2827
KubeletNodeLabels: map[string]string{
2928
"agentpool": "nodepool2",
@@ -716,7 +715,6 @@ func baseTemplateLinux(t testing.TB, location string, k8sVersion string, arch st
716715
"--max-pods": "110",
717716
"--network-plugin": "kubenet",
718717
"--node-status-update-frequency": "10s",
719-
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.6",
720718
"--pod-manifest-path": "/etc/kubernetes/manifests",
721719
"--pod-max-pids": "-1",
722720
"--protect-kernel-defaults": "true",
@@ -934,7 +932,6 @@ DXRqvV7TWO2hndliQq3BW385ZkiephlrmpUVM= r2k1@arturs-mbp.lan`,
934932
"--kube-reserved": "cpu=100m,memory=3891Mi",
935933
"--kubeconfig": "c:\\k\\config",
936934
"--max-pods": "30",
937-
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
938935
"--resolv-conf": "\"\"\"\"",
939936
"--cluster-dns": "10.0.0.10",
940937
"--cluster-domain": "cluster.local",

0 commit comments

Comments
 (0)