Merge pull request #1827 from Nordix/tuomo/remove-kubectl-sha-1.7

🌱 remove KUBECTL_SHA256 passthru
metal3-io · Jul 3, 2024 · 25ef027 · 25ef027
2 parents 63eea79 + bb72712
commit 25ef027
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git 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
@@ -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"}