Skip to content

Commit

Permalink
chore: add binaries for 1.27.100,1.28.15, 1.29.10, 1.30.6, 1.31.2 (#5144
Browse files Browse the repository at this point in the history 
)

Co-authored-by: Wen Huang <[email protected]>
  • Loading branch information
@wenhug
wenhug and Wen Huang authored Oct 26, 2024
1 parent 0b2aa9f commit e341ae5
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
40 changes: 20 additions & 20 deletions parts/linux/cloud-init/artifacts/components.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,28 +532,28 @@
"multiArchVersionsV2": [
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
"latestVersion": "v1.27.16",
"previousLatestVersion": "v1.27.15"
"latestVersion": "v1.27.100-akslts",
"previousLatestVersion": "v1.27.16"
},
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
"latestVersion": "v1.28.14",
"previousLatestVersion": "v1.28.13"
"latestVersion": "v1.28.15",
"previousLatestVersion": "v1.28.14"
},
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
"latestVersion": "v1.29.9",
"previousLatestVersion": "v1.29.8"
"latestVersion": "v1.29.10",
"previousLatestVersion": "v1.29.9"
},
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
"latestVersion": "v1.30.5",
"previousLatestVersion": "v1.30.4"
"latestVersion": "v1.30.6",
"previousLatestVersion": "v1.30.5"
},
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
"latestVersion": "v1.31.1",
"previousLatestVersion": "v1.31.0"
"latestVersion": "v1.31.2",
"previousLatestVersion": "v1.31.1"
}
]
}
Expand Down Expand Up @@ -777,32 +777,32 @@
{
"k8sVersion": "1.27",
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "1.27.16",
"previousLatestVersion": "1.27.15"
"latestVersion": "1.27.100-akslts",
"previousLatestVersion": "1.27.16"
},
{
"k8sVersion": "1.28",
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "1.28.14",
"previousLatestVersion": "1.28.13"
"latestVersion": "1.28.15",
"previousLatestVersion": "1.28.14"
},
{
"k8sVersion": "1.29",
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "1.29.9",
"previousLatestVersion": "1.29.8"
"latestVersion": "1.29.10",
"previousLatestVersion": "1.29.9"
},
{
"k8sVersion": "1.30",
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "1.30.5",
"previousLatestVersion": "1.30.4"
"latestVersion": "1.30.6",
"previousLatestVersion": "1.30.5"
},
{
"k8sVersion": "1.31",
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "1.31.1",
"previousLatestVersion": "1.31.0"
"latestVersion": "1.31.2",
"previousLatestVersion": "1.31.1"
}
],
"downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${version}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
14 changes: 6 additions & 8 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,22 +191,20 @@ $global:map = @{
# 2. Keep 1.18.10, 1.18.14, 1.18.17, 1.18.18
# 3. Keep v1.18.17-hotfix.20210322 when adding v1.18.17-hotfix.20210505
"c:\akse-cache\win-k8s\" = @(
"https://acs-mirror.azureedge.net/kubernetes/v1.27.14-hotfix.20240712/windowszip/v1.27.14-hotfix.20240712-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.27.15-hotfix.20240712/windowszip/v1.27.15-hotfix.20240712-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.27.16/windowszip/v1.27.16-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.11-hotfix.20240712/windowszip/v1.28.11-hotfix.20240712-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.12/windowszip/v1.28.12-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.27.100-akslts/windowszip/v1.27.100-akslts-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.13/windowszip/v1.28.13-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.14/windowszip/v1.28.14-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.29.6-hotfix.20240712/windowszip/v1.29.6-hotfix.20240712-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.29.7/windowszip/v1.29.7-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.15/windowszip/v1.28.15-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.29.8/windowszip/v1.29.8-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.29.9/windowszip/v1.29.9-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.30.2-hotfix.20240712/windowszip/v1.30.2-hotfix.20240712-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.30.3/windowszip/v1.30.3-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.29.10/windowszip/v1.29.10-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.30.4/windowszip/v1.30.4-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.30.5/windowszip/v1.30.5-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.31.1/windowszip/v1.31.1-1int.zip"
"https://acs-mirror.azureedge.net/kubernetes/v1.30.6/windowszip/v1.30.6-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.31.1/windowszip/v1.31.1-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.31.2/windowszip/v1.31.2-1int.zip"
);
"c:\akse-cache\win-vnet-cni\" = @(
# Azure CNI v1 (legacy)
Expand Down
3 changes: 3 additions & 0 deletions vhdbuilder/packer/test/linux-vhd-content-test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@ testKubeBinariesPresent() {
patchedK8sVersion=$(echo ${patchedK8sVersion} | cut -d"." -f1,2,3)
fi
k8sVersion=$(echo ${patchedK8sVersion} | cut -d"_" -f1 | cut -d"-" -f1 | cut -d"." -f1,2,3)
if grep -iq akslts <<<${patchedK8sVersion}; then
k8sVersion="$k8sVersion-akslts"
fi
kubeletDownloadLocation="$binaryDir/kubelet-$k8sVersion"
kubectlDownloadLocation="$binaryDir/kubectl-$k8sVersion"
kubeletInstallLocation="/usr/local/bin/kubelet"
Expand Down

0 comments on commit e341ae5

Please sign in to comment.