Skip to content

Commit fec2cbf

Browse files
djslydjsly
authored
Security: migrating to oss/v2 for the pause image, aligning version to 3.6 for linux and 3.10.1 for windows (#7083)
1 parent 5c4234a commit fec2cbf

31 files changed

Lines changed: 113 additions & 66 deletions

File tree

‎.github/renovate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"matchPackageNames": [
2727
"oss/kubernetes/autoscaler/addon-resizer",
28-
"oss/kubernetes/pause",
28+
"oss/v2/kubernetes/pause",
2929
"oss/v2/kubernetes/coredns",
3030
"containernetworking/azure-cni",
3131
"containernetworking/azure-cns",

‎e2e/node_config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ func baseTemplateLinux(t testing.TB, location string, k8sVersion string, arch st
531531
ContainerdDownloadURLBase: "https://storage.googleapis.com/cri-containerd-release/",
532532
CSIProxyDownloadURL: "https://packages.aks.azure.com/csi-proxy/v0.1.0/binaries/csi-proxy.tar.gz",
533533
WindowsProvisioningScriptsPackageURL: "https://packages.aks.azure.com/aks-engine/windows/provisioning/signedscripts-v0.2.2.zip",
534-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0",
534+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
535535
AlwaysPullWindowsPauseImage: false,
536536
CseScriptsPackageURL: "https://packages.aks.azure.com/aks/windows/cse/",
537537
CNIARM64PluginsDownloadURL: "https://packages.aks.azure.com/cni-plugins/v0.8.7/binaries/cni-plugins-linux-arm64-v0.8.7.tgz",
@@ -805,7 +805,7 @@ func baseTemplateWindows(t testing.TB, location string) *datamodel.NodeBootstrap
805805
WindowsDockerVersion: "",
806806
WindowsImageSourceURL: "",
807807
WindowsOffer: "aks-windows",
808-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808",
808+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
809809
WindowsPublisher: "microsoft-aks",
810810
WindowsSku: "",
811811
},
@@ -848,7 +848,7 @@ DXRqvV7TWO2hndliQq3BW385ZkiephlrmpUVM= r2k1@arturs-mbp.lan`,
848848
// VnetCNIARM64LinuxPluginsDownloadURL: "https://packages.aks.azure.com/azure-cni/v1.4.13/binaries/azure-vnet-cni-linux-arm64-v1.4.14.tgz",
849849
// VnetCNILinuxPluginsDownloadURL: "https://packages.aks.azure.com/azure-cni/v1.1.3/binaries/azure-vnet-cni-linux-amd64-v1.1.3.tgz",
850850
VnetCNIWindowsPluginsDownloadURL: "https://packages.aks.azure.com/azure-cni/v1.6.21/binaries/azure-vnet-cni-windows-amd64-v1.6.21.zip",
851-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808",
851+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
852852
WindowsProvisioningScriptsPackageURL: "https://packages.aks.azure.com/aks/windows/cse/aks-windows-cse-scripts-v0.0.52.zip",
853853
WindowsTelemetryGUID: "fb801154-36b9-41bc-89c2-f4d4f05472b0",
854854
},
@@ -894,7 +894,7 @@ DXRqvV7TWO2hndliQq3BW385ZkiephlrmpUVM= r2k1@arturs-mbp.lan`,
894894
"--kube-reserved": "cpu=100m,memory=3891Mi",
895895
"--kubeconfig": "c:\\k\\config",
896896
"--max-pods": "30",
897-
"--pod-infra-container-image": "mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808",
897+
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
898898
"--resolv-conf": "\"\"\"\"",
899899
"--cluster-dns": "10.0.0.10",
900900
"--cluster-domain": "cluster.local",

‎parts/common/components.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,22 @@
120120
}
121121
]
122122
},
123+
{
124+
"downloadURL": "mcr.microsoft.com/oss/v2/kubernetes/pause:*",
125+
"amd64OnlyVersions": [],
126+
"multiArchVersionsV2": [
127+
{
128+
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/v2/kubernetes/pause",
129+
"latestVersion": "3.6"
130+
}
131+
],
132+
"windowsVersions": [
133+
{
134+
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/v2/kubernetes/pause",
135+
"latestVersion": "3.10.1"
136+
}
137+
]
138+
},
123139
{
124140
"downloadURL": "mcr.microsoft.com/oss/v2/kubernetes/coredns:*",
125141
"amd64OnlyVersions": [],

‎pkg/agent/baker_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,7 +2463,7 @@ var _ = Describe("Assert generated customData and cseCmd for Windows", func() {
24632463
},
24642464
WindowsProfile: &datamodel.WindowsProfile{
24652465
ProvisioningScriptsPackageURL: "https://acs-mirror.azureedge.net/aks-engine/windows/provisioning/signedscripts-v0.0.4.zip",
2466-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0",
2466+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
24672467
AdminUsername: "azureuser",
24682468
AdminPassword: "replacepassword1234",
24692469
WindowsPublisher: "microsoft-aks",
@@ -2529,7 +2529,7 @@ var _ = Describe("Assert generated customData and cseCmd for Windows", func() {
25292529
"--max-pods": "30",
25302530
"--network-plugin": "cni",
25312531
"--node-status-update-frequency": "10s",
2532-
"--pod-infra-container-image": "mcr.microsoft.com/oss/kubernetes/pause:3.9",
2532+
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.6",
25332533
"--pod-max-pids": "-1",
25342534
"--read-only-port": "0",
25352535
"--resolv-conf": `""`,

‎pkg/agent/datamodel/mocks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ var (
129129
ContainerdDownloadURLBase: "https://storage.googleapis.com/cri-containerd-release/",
130130
CSIProxyDownloadURL: "https://acs-mirror.azureedge.net/csi-proxy/v0.1.0/binaries/csi-proxy.tar.gz",
131131
WindowsProvisioningScriptsPackageURL: "https://acs-mirror.azureedge.net/aks-engine/windows/provisioning/signedscripts-v0.2.2.zip",
132-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0",
132+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
133133
AlwaysPullWindowsPauseImage: false,
134134
CseScriptsPackageURL: "https://acs-mirror.azureedge.net/aks/windows/cse/csescripts-v0.0.1.zip",
135135
CNIARM64PluginsDownloadURL: "https://acs-mirror.azureedge.net/cni-plugins/v0.8.7/binaries/cni-plugins-linux-arm64-v0.8.7.tgz",

‎pkg/agent/datamodel/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1708,7 +1708,7 @@ func FormatProdFQDNByLocation(fqdnPrefix string, location string, cloudSpecConfi
17081708

17091709
type K8sComponents struct {
17101710
// Full path to the "pause" image. Used for --pod-infra-container-image.
1711-
// For example: "mcr.microsoft.com/oss/kubernetes/pause:1.3.1".
1711+
// For example: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.6".
17121712
PodInfraContainerImageURL string
17131713

17141714
// Full path to the hyperkube image.

‎pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $global:VNetCIDR = "10.0.0.0/8"
101101

102102
$global:KubeletNodeLabels = "agentpool=wpool2,kubernetes.azure.com/agentpool=wpool2,kubernetes.azure.com/node-image-version=AKSWindows-2019-17763.1577.201111"
103103

104-
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=10.0.0.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-credential-provider-bin-dir=c:\var\lib\kubelet\credential-provider", "--image-credential-provider-config=c:\var\lib\kubelet\credential-provider-config.yaml", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/kubernetes/pause:3.9", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
104+
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=10.0.0.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-credential-provider-bin-dir=c:\var\lib\kubelet\credential-provider", "--image-credential-provider-config=c:\var\lib\kubelet\credential-provider-config.yaml", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/v2/kubernetes/pause:3.6", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
105105
$global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
106106

107107
$global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
@@ -157,7 +157,7 @@ $global:CSEScriptsPackageUrl = "";
157157
$global:GpuDriverURL = "";
158158

159159
# PauseImage
160-
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/kubernetes/pause:1.4.0";
160+
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1";
161161
$global:AlwaysPullWindowsPauseImage = [System.Convert]::ToBoolean("true");
162162

163163
# Calico

‎pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $global:VNetCIDR = "10.0.0.0/8"
101101

102102
$global:KubeletNodeLabels = "agentpool=wpool2,kubernetes.azure.com/agentpool=wpool2,kubernetes.azure.com/node-image-version=AKSWindows-2019-17763.1577.201111"
103103

104-
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=10.0.0.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=DynamicKubeletConfig=false,RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/kubernetes/pause:3.9", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
104+
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=10.0.0.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=DynamicKubeletConfig=false,RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/v2/kubernetes/pause:3.6", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
105105
$global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
106106

107107
$global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
@@ -157,7 +157,7 @@ $global:CSEScriptsPackageUrl = "";
157157
$global:GpuDriverURL = "";
158158

159159
# PauseImage
160-
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/kubernetes/pause:1.4.0";
160+
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1";
161161
$global:AlwaysPullWindowsPauseImage = [System.Convert]::ToBoolean("true");
162162

163163
# Calico

‎pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $global:VNetCIDR = "172.17.0.0/16"
101101

102102
$global:KubeletNodeLabels = "agentpool=wpool2,kubernetes.azure.com/agentpool=wpool2,kubernetes.azure.com/node-image-version=AKSWindows-2019-17763.1577.201111"
103103

104-
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=172.17.255.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=DynamicKubeletConfig=false,RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/kubernetes/pause:3.9", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
104+
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=172.17.255.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=DynamicKubeletConfig=false,RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/v2/kubernetes/pause:3.6", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
105105
$global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
106106

107107
$global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
@@ -157,7 +157,7 @@ $global:CSEScriptsPackageUrl = "";
157157
$global:GpuDriverURL = "";
158158

159159
# PauseImage
160-
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/kubernetes/pause:1.4.0";
160+
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1";
161161
$global:AlwaysPullWindowsPauseImage = [System.Convert]::ToBoolean("false");
162162

163163
# Calico

‎pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $global:VNetCIDR = "10.0.0.0/8"
101101

102102
$global:KubeletNodeLabels = "agentpool=wpool2,kubernetes.azure.com/agentpool=wpool2,kubernetes.azure.com/node-image-version=AKSWindows-2019-17763.1577.201111"
103103

104-
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=10.0.0.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=DynamicKubeletConfig=false,RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/kubernetes/pause:3.9", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
104+
$global:KubeletConfigArgs = @( "--address=0.0.0.0", "--anonymous-auth=false", "--authentication-token-webhook=true", "--authorization-mode=Webhook", "--azure-container-registry-config=c:\k\azure.json", "--cgroups-per-qos=false", "--client-ca-file=c:\k\ca.crt", "--cloud-config=c:\k\azure.json", "--cloud-provider=azure", "--cluster-dns=10.0.0.10", "--cluster-domain=cluster.local", "--enforce-node-allocatable=", "--event-qps=0", "--eviction-hard=", "--feature-gates=DynamicKubeletConfig=false,RotateKubeletServerCertificate=true", "--hairpin-mode=promiscuous-bridge", "--image-gc-high-threshold=85", "--image-gc-low-threshold=80", "--kube-reserved=cpu=100m,memory=1843Mi", "--kubeconfig=c:\k\config", "--max-pods=30", "--network-plugin=cni", "--node-status-update-frequency=10s", "--pod-infra-container-image=mcr.microsoft.com/oss/v2/kubernetes/pause:3.6", "--pod-max-pids=-1", "--read-only-port=0", "--resolv-conf=""", "--rotate-certificates=false", "--streaming-connection-idle-timeout=4h", "--system-reserved=memory=2Gi", "--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256" )
105105
$global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
106106

107107
$global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
@@ -157,7 +157,7 @@ $global:CSEScriptsPackageUrl = "";
157157
$global:GpuDriverURL = "";
158158

159159
# PauseImage
160-
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/kubernetes/pause:1.4.0";
160+
$global:WindowsPauseImageURL = "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1";
161161
$global:AlwaysPullWindowsPauseImage = [System.Convert]::ToBoolean("false");
162162

163163
# Calico

0 commit comments

Comments
 (0)