Skip to content

Commit 084e704

Browse files
Merge pull request #1191 from Nordix/tuomo/kubectl-sha256-export-1.3
🌱 add KUBECTL_SHA256 passthru
2 parents 529905e + f109240 commit 084e704

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

scripts/ci-e2e.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}
2626
export CAPM3_VERSION=${CAPM3_VERSION:-"v1beta1"}
2727
export NUM_NODES=${NUM_NODES:-"4"}
2828
export KUBERNETES_VERSION=${FROM_K8S_VERSION}
29+
export KUBECTL_SHA256=${KUBECTL_SHA256}
2930
export IMAGE_OS=${IMAGE_OS}
3031
export FORCE_REPO_UPDATE="false"
3132
EOF

scripts/environment.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ fi
5050

5151
export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.24.9"}
5252
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.25.2"}
53+
# NOTE: kubectl sha256 must match the provided FROM_K8S_VERSION in release-1.3, and must be
54+
# provided in JJB for upgrade tests where version is different from the default
55+
export KUBECTL_SHA256="${KUBECTL_SHA256:-7e13f33b7379b6c25c3ae055e4389eb3eef168e563f37b5c5f1be672e46b686e}"
5356

5457
# Can be overriden from jjbs
5558
export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}

0 commit comments

Comments
 (0)