From 296ed9c44c5704b2337edee8cfc58ade7ca55d6e Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Sat, 9 Apr 2022 09:06:29 +0200
Subject: [PATCH] Use --discovery-store instead of overrides for irsa in
 scenarios

---
 tests/e2e/scenarios/lib/common.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/scenarios/lib/common.sh b/tests/e2e/scenarios/lib/common.sh
index b70cd1b4cf..397323debd 100644
--- a/tests/e2e/scenarios/lib/common.sh
+++ b/tests/e2e/scenarios/lib/common.sh
@@ -50,12 +50,6 @@ if [[ -z "${DISCOVERY_STORE-}" ]]; then
     DISCOVERY_STORE="${KOPS_STATE_STORE-}"
 fi
 
-if [[ ${KOPS_IRSA-} = true ]]; then
-    OVERRIDES="${OVERRIDES-} --override=cluster.spec.serviceAccountIssuerDiscovery.discoveryStore=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
-    OVERRIDES="${OVERRIDES} --override=cluster.spec.serviceAccountIssuerDiscovery.enableAWSOIDCProvider=true"
-    OVERRIDES="${OVERRIDES} --override=cluster.spec.iam.useServiceAccountExternalPermissions=true"
-fi
-
 export GO111MODULE=on
 
 if [[ -z "${AWS_SSH_PRIVATE_KEY_FILE-}" ]]; then
@@ -134,6 +128,10 @@ function kops-up() {
         K8S_VERSION="$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)"
     fi
 
+    if [[ ${KOPS_IRSA-} = true ]]; then
+        create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
+    fi
+
     ${KUBETEST2} \
         --up \
         --kops-binary-path="${KOPS}" \