Merge pull request #17969 from rifelpet/cleanup-discoverystore

Remove DISCOVERY_STORE handling

Author: k8s-ci-robot

tests/e2e/scenarios/lib/common.sh

@@ -41,10 +41,6 @@ export CHANNELS
 
 export KOPS_RUN_TOO_NEW_VERSION=1
 
-if [[ -z "${DISCOVERY_STORE-}" ]]; then
-    DISCOVERY_STORE="${KOPS_STATE_STORE-}"
-fi
-
 if [[ -z "${AWS_SSH_PRIVATE_KEY_FILE-}" ]]; then
     export AWS_SSH_PRIVATE_KEY_FILE="${HOME}/.ssh/id_rsa"
 fi
@@ -132,10 +128,6 @@ function kops-up() {
         K8S_VERSION="$(curl -fs -L https://dl.k8s.io/release/stable.txt)"
     fi
 
-    if [[ ${KOPS_IRSA-} = true ]]; then
-        create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
-    fi
-
     # TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT
     if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then
       echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead"

tests/e2e/scenarios/upgrade-ab/run-test.sh

@@ -78,11 +78,6 @@ else
   KOPS="${KOPS_A}"
 fi
 
-create_args=""
-if [[ ${KOPS_IRSA-} = true ]]; then
-  create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
-fi
-
 # TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT
 if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then
   echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead"