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 1.19.0-rc.4 #3666

Merged
merged 2 commits into from
Aug 7, 2020
Merged

feat: add support for Kubernetes 1.19.0-rc.4 #3666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e66743
feat: add support for Kubernetes 1.19.0-rc.4
mboersma Aug 4, 2020
f0f4cc2
ci: give Windows VHD pipeline 2.5 hours to do its work
mboersma Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pipelines/vhd-builder-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pr: none

jobs:
- job: build_vhd_windows
timeoutInMinutes: 120
timeoutInMinutes: 150
strategy:
maxParallel: 0
pool:
Expand Down Expand Up @@ -130,5 +130,5 @@ jobs:

- script: |
sudo chown -R $USER:$USER .
displayName: cleanup - chown all files in work directory
displayName: cleanup - chown all files in work directory
condition: always()
1 change: 1 addition & 0 deletions pkg/api/common/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.19.0-beta.1": true,
"1.19.0-beta.2": true,
"1.19.0-rc.3": true,
"1.19.0-rc.4": true,
}

// AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/configure-windows-vhd.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function Get-FilesToCacheOnVHD
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.4-hotfix.20200624/windowszip/v1.18.4-hotfix.20200624-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.5/windowszip/v1.18.5-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.6/windowszip/v1.18.6-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.0-rc.3/windowszip/v1.19.0-rc.3-1int.zip"
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.0-rc.4/windowszip/v1.19.0-rc.4-1int.zip"
);
"c:\akse-cache\win-vnet-cni\" = @(
"https://kubernetesartifacts.azureedge.net/azure-cni/v1.1.2/binaries/azure-vnet-cni-singletenancy-windows-amd64-v1.1.2.zip",
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ pullContainerImage "docker" "busybox"
echo " - busybox" >> ${VHD_LOGS_FILEPATH}

K8S_VERSIONS="
1.19.0-rc.3
1.19.0-rc.4
1.18.6
1.18.5
1.17.9
Expand Down