Skip to content

Commit f62f910

Browse files
authored
fix: replace AKS LTS versioning with commonly reached k8s patch version (#4094)
1 parent e8b71f9 commit f62f910

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ jobs:
2727
# pulling k8s version from AKS.
2828
eval k8sVersion="v"$( az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query "currentKubernetesVersion")
2929
echo $k8sVersion
30+
patchVersion=`echo "${k8sVersion##*.}"`
31+
if [ $patchVersion -ge 100 ]; then
32+
# For LTS versions we use a commonly reached patch version from kubernetes upstream
33+
k8sVersion="${k8sVersion%.*}.12"
34+
echo "LTS version detected, adjusting k8sVersion to ${k8sVersion}"
35+
fi
3036
curl -L https://dl.k8s.io/$k8sVersion/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
3137
3238
# https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list

.pipelines/cni/k8s-e2e/k8s-e2e.jobs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ jobs:
3030
# pulling k8s version from AKS.
3131
eval k8sVersion="v"$( az aks show -g ${{ parameters.clusterName }} -n ${{ parameters.clusterName }} --query "currentKubernetesVersion")
3232
echo $k8sVersion
33+
patchVersion=`echo "${k8sVersion##*.}"`
34+
if [ $patchVersion -ge 100 ]; then
35+
# For LTS versions we use a commonly reached patch version from kubernetes upstream
36+
k8sVersion="${k8sVersion%.*}.12"
37+
echo "LTS version detected, adjusting k8sVersion to ${k8sVersion}"
38+
fi
3339
curl -L https://dl.k8s.io/$k8sVersion/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
3440
3541
# https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list

0 commit comments

Comments
 (0)