Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

feat: add support for Kubernetes v1.20.5 #4339

Merged
merged 1 commit into from
Mar 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/api/common/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.20.1": false,
"1.20.2": false,
"1.20.3": false,
"1.20.4": true,
"1.20.4": false,
"1.20.5": true,
"1.21.0-alpha.1": false,
"1.21.0-alpha.2": false, // disabled, see https://github.com/kubernetes/kubernetes/issues/98419
"1.21.0-alpha.3": false,
Expand Down
4 changes: 2 additions & 2 deletions vhd/packer/configure-windows-vhd.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function Get-FilesToCacheOnVHD {
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.17/windowszip/v1.17.17-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.16/windowszip/v1.18.16-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.9/windowszip/v1.19.9-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.4/windowszip/v1.20.4-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.5/windowszip/v1.20.5-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.21.0-beta.1/windowszip/v1.21.0-beta.1-1int.zip"
);
"c:\akse-cache\win-vnet-cni\" = @(
Expand Down Expand Up @@ -295,7 +295,7 @@ function Update-WindowsFeatures {

function Update-Registry {
# if multple LB policies are included for same endpoint then HNS hangs.
# this fix forces an error
# this fix forces an error
Write-Host "Enable a HNS fix in 2021-2C+"
Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\hns\State" -Name HNSControlFlag -Value 1 -Type DWORD
}
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH}

K8S_VERSIONS="
1.21.0-beta.1
1.20.4
1.20.5
1.19.9
1.18.16
1.18.15-azs
Expand Down