From bb72712a2051553a3b5171be6ae336a6cbf15189 Mon Sep 17 00:00:00 2001 From: Tuomo Tanskanen Date: Tue, 2 Jul 2024 13:11:20 +0300 Subject: [PATCH] remove KUBECTL_SHA256 passthru Manual cherry-pick of PR 1822. Signed-off-by: Tuomo Tanskanen --- scripts/ci-e2e.sh | 1 - scripts/environment.sh | 3 --- 2 files changed, 4 deletions(-) diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index 72c76a324e..9117a147d3 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -40,7 +40,6 @@ export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"} export CAPM3_VERSION=${CAPM3_VERSION:-"v1beta1"} export NUM_NODES=${NUM_NODES:-"4"} export KUBERNETES_VERSION=${KUBERNETES_VERSION} -export KUBECTL_SHA256=${KUBECTL_SHA256} export IMAGE_OS=${IMAGE_OS} export FORCE_REPO_UPDATE="false" EOF diff --git a/scripts/environment.sh b/scripts/environment.sh index 7d481114a6..98249b6125 100644 --- a/scripts/environment.sh +++ b/scripts/environment.sh @@ -50,9 +50,6 @@ fi export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.28.1"} export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.29.0"} -# NOTE: kubectl sha256 must match the provided KUBERNETES_VERSION, and must be -# provided in JJB for upgrade tests where version is different from the default -export KUBECTL_SHA256="${KUBECTL_SHA256:-0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5}" # Can be overriden from jjbs export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}