Merge branch 'main' into rhoaeng-2285

Author: KPostOffice

Diff for: .github/workflows/e2e_tests.yaml

@@ -82,15 +82,14 @@ jobs:
         id: deploy
         run: |
           cd codeflare-operator
+          echo Setting up CodeFlare stack
+          make setup-e2e
           echo Deploying CodeFlare operator
           IMG="${REGISTRY_ADDRESS}"/codeflare-operator
+          sed -i 's/RayDashboardOAuthEnabled: pointer.Bool(true)/RayDashboardOAuthEnabled: pointer.Bool(false)/' main.go
           make image-push -e IMG="${IMG}"
           make deploy -e IMG="${IMG}" -e ENV="e2e"
           kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager
-
-          echo Setting up CodeFlare stack
-          make setup-e2e
-
           cd ..
 
       - name: Add user to KinD
@@ -102,12 +101,10 @@ jobs:
         run: |
           kubectl create clusterrole list-ingresses --verb=get,list --resource=ingresses
           kubectl create clusterrolebinding sdk-user-list-ingresses --clusterrole=list-ingresses --user=sdk-user
-          kubectl create clusterrole appwrapper-creator --verb=get,list,create,delete,patch --resource=appwrappers
-          kubectl create clusterrolebinding sdk-user-appwrapper-creator --clusterrole=appwrapper-creator --user=sdk-user
           kubectl create clusterrole namespace-creator --verb=get,list,create,delete,patch --resource=namespaces
           kubectl create clusterrolebinding sdk-user-namespace-creator --clusterrole=namespace-creator --user=sdk-user
-          kubectl create clusterrole list-rayclusters --verb=get,list --resource=rayclusters
-          kubectl create clusterrolebinding sdk-user-list-rayclusters --clusterrole=list-rayclusters --user=sdk-user
+          kubectl create clusterrole raycluster-creator --verb=get,list,create,delete,patch --resource=rayclusters
+          kubectl create clusterrolebinding sdk-user-raycluster-creator --clusterrole=raycluster-creator --user=sdk-user
           kubectl config use-context sdk-user
 
       - name: Run e2e tests
@@ -122,6 +119,7 @@ jobs:
           poetry run pytest -v -s ./tests/e2e -m kind > ${CODEFLARE_TEST_OUTPUT_DIR}/pytest_output.log 2>&1
 
       - name: Switch to kind-cluster context to print logs
+        if: always() && steps.deploy.outcome == 'success'
         run: kubectl config use-context kind-cluster
 
       - name: Print CodeFlare operator logs