Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support Kubernetes v1.28.13 #260

Merged
merged 2 commits into from
Oct 10, 2024
Merged

chore: support Kubernetes v1.28.13 #260

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
ca3cd61
chore: support Kubernetes v1.28.13
christinalau0 Oct 10, 2024
fe434a5
Remove pr-e2e from branch protection
christinalau0 Oct 10, 2024
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
1 change: 0 additions & 1 deletion .github/policies/branch-protection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ configuration:
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
- license/cla
- pr-e2e
- GitOps/AdvancedSecurity
# Require branches to be up to date before merging. boolean
requiresStrictStatusChecks: false
Expand Down
9 changes: 6 additions & 3 deletions pkg/api/common/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.27.9": false,
"1.27.10": true,
"1.28.5": false,
"1.28.6": true,
"1.28.6": false,
"1.28.13": true,
}

// AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack
Expand Down Expand Up @@ -417,7 +418,8 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{
"1.27.9": false,
"1.27.10": true,
"1.28.5": false,
"1.28.6": true,
"1.28.6": false,
"1.28.13": true,
}

// AllKubernetesWindowsSupportedVersionsAzureStack maintain a set of available k8s Windows versions in aks-engine on Azure Stack
Expand Down Expand Up @@ -466,7 +468,8 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{
"1.27.9": false,
"1.27.10": true,
"1.28.5": false,
"1.28.6": true,
"1.28.6": false,
"1.28.13": true,
}

// GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/configure-windows-vhd-phase2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function Get-FilesToCacheOnVHD {
"https://kubernetesartifacts.azureedge.net/csi-proxy/v1.1.3/binaries/csi-proxy-v1.1.3.tar.gz"
);
"c:\akse-cache\win-k8s\" = @(
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.6/windowszip/v1.28.6-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.13/windowszip/v1.28.13-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.27.10/windowszip/v1.27.10-1int.zip"
);
"c:\akse-cache\win-vnet-cni\" = @(
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 @@ -125,7 +125,7 @@ function Get-FilesToCacheOnVHD {
"https://kubernetesartifacts.azureedge.net/csi-proxy/v1.1.3/binaries/csi-proxy-v1.1.3.tar.gz"
);
"c:\akse-cache\win-k8s\" = @(
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.6/windowszip/v1.28.6-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.28.13/windowszip/v1.28.13-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.27.10/windowszip/v1.27.10-1int.zip"
);
"c:\akse-cache\win-vnet-cni\" = @(
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 @@ -202,7 +202,7 @@ loadContainerImage ${BUSYBOX_IMAGE}
echo " - ${BUSYBOX_IMAGE}" >> ${VHD_LOGS_FILEPATH}

K8S_VERSIONS="
1.28.6
1.28.13
1.27.10
"
for KUBERNETES_VERSION in ${K8S_VERSIONS}; do
Expand Down