Skip to content

Commit 59cbbdc

Browse files
committed
Add K8s 1.31 to CI by pinning kops commit
1 parent 8cae810 commit 59cbbdc

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

hack/e2e/config.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ OUTPOST_ARN=${OUTPOST_ARN:-}
3333
OUTPOST_INSTANCE_TYPE=${OUTPOST_INSTANCE_TYPE:-${INSTANCE_TYPE}}
3434

3535
# kops: must include patch version (e.g. 1.19.1)
36-
# eksctl: mustn't include patch version (e.g. 1.19)
3736
# NOTE: Keep KOPS at v1.29.x until ELB usage bug fixed
38-
K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-1.29.6}
37+
K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-1.31.1}
3938
K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-1.31}
4039

4140
EBS_INSTALL_SNAPSHOT=${EBS_INSTALL_SNAPSHOT:-"true"}

hack/e2e/kops/kops.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
set -euo pipefail
2121

22+
export KOPS_RUN_TOO_NEW_VERSION=true
23+
2224
function kops_create_cluster() {
2325
CLUSTER_NAME=${1}
2426
KOPS_BIN=${2}

hack/tools/install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ GOMPLATE_VERSION="v4.1.0"
3333
# https://github.com/helm/helm
3434
HELM_VERSION="v3.15.4"
3535
# https://github.com/kubernetes/kops
36-
# NOTE: Keep at v1.29.0 until ELB usage bug fixed
37-
KOPS_VERSION="v1.29.0"
36+
# NOTE: We pin kops to a commit instead of a release to support newer versions of k8s earlier
37+
KOPS_COMMIT="2f877fcf5755b8c6f6a2d937cb1f62dea3a9536a"
3838
# https://pkg.go.dev/sigs.k8s.io/kubetest2?tab=versions
3939
KUBETEST2_VERSION="v0.0.0-20240703180642-53f3d216ad9f"
4040
# https://github.com/golang/mock
@@ -153,9 +153,10 @@ function install_helm() {
153153
}
154154

155155
function install_kops() {
156+
# Build from source so we can test latest Kubernetes version earlier.
156157
INSTALL_PATH="${1}"
157158

158-
install_binary "${INSTALL_PATH}" "https://github.com/kubernetes/kops/releases/download/${KOPS_VERSION}/kops-${OS}-${ARCH}" "kops"
159+
install_go "${INSTALL_PATH}" "k8s.io/kops/cmd/kops@${KOPS_COMMIT}"
159160
}
160161

161162
function install_kubetest2() {

0 commit comments

Comments
 (0)