Skip to content

Commit d0dcec1

Browse files
djslydjsly
committed
migrating to oss/v2 for pause, aligning version to 3.6 for linux and 3.10.1 for windows
1 parent 7f4966d commit d0dcec1

30 files changed

Lines changed: 116 additions & 72 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
@@ -535,7 +535,7 @@ func baseTemplateLinux(t testing.TB, location string, k8sVersion string, arch st
535535
ContainerdDownloadURLBase: "https://storage.googleapis.com/cri-containerd-release/",
536536
CSIProxyDownloadURL: "https://packages.aks.azure.com/csi-proxy/v0.1.0/binaries/csi-proxy.tar.gz",
537537
WindowsProvisioningScriptsPackageURL: "https://packages.aks.azure.com/aks-engine/windows/provisioning/signedscripts-v0.2.2.zip",
538-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0",
538+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
539539
AlwaysPullWindowsPauseImage: false,
540540
CseScriptsPackageURL: "https://packages.aks.azure.com/aks/windows/cse/",
541541
CNIARM64PluginsDownloadURL: "https://packages.aks.azure.com/cni-plugins/v0.8.7/binaries/cni-plugins-linux-arm64-v0.8.7.tgz",
@@ -809,7 +809,7 @@ func baseTemplateWindows(t testing.TB, location string) *datamodel.NodeBootstrap
809809
WindowsDockerVersion: "",
810810
WindowsImageSourceURL: "",
811811
WindowsOffer: "aks-windows",
812-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808",
812+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
813813
WindowsPublisher: "microsoft-aks",
814814
WindowsSku: "",
815815
},
@@ -856,7 +856,7 @@ DXRqvV7TWO2hndliQq3BW385ZkiephlrmpUVM= r2k1@arturs-mbp.lan`,
856856
// VnetCNIARM64LinuxPluginsDownloadURL: "https://packages.aks.azure.com/azure-cni/v1.4.13/binaries/azure-vnet-cni-linux-arm64-v1.4.14.tgz",
857857
// VnetCNILinuxPluginsDownloadURL: "https://packages.aks.azure.com/azure-cni/v1.1.3/binaries/azure-vnet-cni-linux-amd64-v1.1.3.tgz",
858858
VnetCNIWindowsPluginsDownloadURL: "https://packages.aks.azure.com/azure-cni/v1.6.21/binaries/azure-vnet-cni-windows-amd64-v1.6.21.zip",
859-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808",
859+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
860860
WindowsProvisioningScriptsPackageURL: "https://packages.aks.azure.com/aks/windows/cse/aks-windows-cse-scripts-v0.0.52.zip",
861861
WindowsTelemetryGUID: "fb801154-36b9-41bc-89c2-f4d4f05472b0",
862862
},
@@ -902,7 +902,7 @@ DXRqvV7TWO2hndliQq3BW385ZkiephlrmpUVM= r2k1@arturs-mbp.lan`,
902902
"--kube-reserved": "cpu=100m,memory=3891Mi",
903903
"--kubeconfig": "c:\\k\\config",
904904
"--max-pods": "30",
905-
"--pod-infra-container-image": "mcr.microsoft.com/oss/kubernetes/pause:3.9-hotfix-20230808",
905+
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
906906
"--resolv-conf": "\"\"\"\"",
907907
"--cluster-dns": "10.0.0.10",
908908
"--cluster-domain": "cluster.local",

‎parts/common/components.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,22 @@
115115
}
116116
]
117117
},
118+
{
119+
"downloadURL": "mcr.microsoft.com/oss/v2/kubernetes/pause:*",
120+
"amd64OnlyVersions": [],
121+
"multiArchVersionsV2": [
122+
{
123+
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/v2/kubernetes/pause",
124+
"latestVersion": "3.6"
125+
}
126+
],
127+
"windowsVersions": [
128+
{
129+
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/v2/kubernetes/pause",
130+
"latestVersion": "3.10.1"
131+
}
132+
]
133+
},
118134
{
119135
"downloadURL": "mcr.microsoft.com/oss/v2/kubernetes/coredns:*",
120136
"amd64OnlyVersions": [],

‎pkg/agent/baker_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,7 +2408,7 @@ var _ = Describe("Assert generated customData and cseCmd for Windows", func() {
24082408
},
24092409
WindowsProfile: &datamodel.WindowsProfile{
24102410
ProvisioningScriptsPackageURL: "https://acs-mirror.azureedge.net/aks-engine/windows/provisioning/signedscripts-v0.0.4.zip",
2411-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0",
2411+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
24122412
AdminUsername: "azureuser",
24132413
AdminPassword: "replacepassword1234",
24142414
WindowsPublisher: "microsoft-aks",
@@ -2474,7 +2474,7 @@ var _ = Describe("Assert generated customData and cseCmd for Windows", func() {
24742474
"--max-pods": "30",
24752475
"--network-plugin": "cni",
24762476
"--node-status-update-frequency": "10s",
2477-
"--pod-infra-container-image": "mcr.microsoft.com/oss/kubernetes/pause:3.9",
2477+
"--pod-infra-container-image": "mcr.microsoft.com/oss/v2/kubernetes/pause:3.6",
24782478
"--pod-max-pids": "-1",
24792479
"--read-only-port": "0",
24802480
"--resolv-conf": `""`,

‎pkg/agent/datamodel/mocks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ var (
134134
ContainerdDownloadURLBase: "https://storage.googleapis.com/cri-containerd-release/",
135135
CSIProxyDownloadURL: "https://acs-mirror.azureedge.net/csi-proxy/v0.1.0/binaries/csi-proxy.tar.gz",
136136
WindowsProvisioningScriptsPackageURL: "https://acs-mirror.azureedge.net/aks-engine/windows/provisioning/signedscripts-v0.2.2.zip",
137-
WindowsPauseImageURL: "mcr.microsoft.com/oss/kubernetes/pause:1.4.0",
137+
WindowsPauseImageURL: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.10.1",
138138
AlwaysPullWindowsPauseImage: false,
139139
CseScriptsPackageURL: "https://acs-mirror.azureedge.net/aks/windows/cse/csescripts-v0.0.1.zip",
140140
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
@@ -1723,7 +1723,7 @@ func FormatProdFQDNByLocation(fqdnPrefix string, location string, cloudSpecConfi
17231723

17241724
type K8sComponents struct {
17251725
// Full path to the "pause" image. Used for --pod-infra-container-image.
1726-
// For example: "mcr.microsoft.com/oss/kubernetes/pause:1.3.1".
1726+
// For example: "mcr.microsoft.com/oss/v2/kubernetes/pause:3.6".
17271727
PodInfraContainerImageURL string
17281728

17291729
// 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)