Merge pull request #9127 from leseb/fix-9090

ci: wait for kubeproxy to be ready
rook · Nov 8, 2021 · 8cfaedc · 8cfaedc
2 parents cd4862a + 0e26176
commit 8cfaedc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml
@@ -661,8 +661,8 @@ jobs:
     - name: setup minikube
       uses: manusa/actions-setup-minikube@v2.4.2
       with:
-        minikube version: 'v1.21.0'
-        kubernetes version: 'v1.19.2'
+        minikube version: 'v1.23.2'
+        kubernetes version: 'v1.22.2'
         start args: --memory 6g --cpus=2
         github token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/tests/scripts/deploy-validate-vault.sh b/tests/scripts/deploy-validate-vault.sh
@@ -188,18 +188,12 @@ function set_up_vault_kubernetes_auth {
   # enable kubernetes auth
   kubectl exec -ti vault-0 -- vault auth enable kubernetes
 
-  # To fetch the service account issuer
-  kubectl proxy &
-  proxy_pid=$!
-
   # configure the kubernetes auth
   kubectl exec -ti vault-0 -- vault write auth/kubernetes/config \
     token_reviewer_jwt="$SA_JWT_TOKEN" \
     kubernetes_host="$K8S_HOST" \
     kubernetes_ca_cert="$SA_CA_CRT" \
-    issuer="$(curl --silent http://127.0.0.1:8001/.well-known/openid-configuration | jq -r .issuer)"
-
-  kill $proxy_pid
+    issuer="https://kubernetes.default.svc.cluster.local"
 
   # configure a role for rook
   kubectl exec -ti vault-0 -- vault write auth/kubernetes/role/"$ROOK_NAMESPACE" \