Skip to content

Commit bd3f2f7

Browse files
Disable OAuth for e2e tests
1 parent 321ef04 commit bd3f2f7

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/e2e_tests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
run: |
6161
echo Deploying CodeFlare operator
6262
IMG="${REGISTRY_ADDRESS}"/codeflare-operator
63+
sed -i 's/RayDashboardOAuthEnabled: pointer.Bool(true)/RayDashboardOAuthEnabled: pointer.Bool(false)/' main.go
6364
make image-push -e IMG="${IMG}"
6465
make deploy -e IMG="${IMG}" -e ENV="e2e"
6566
kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager

pkg/controllers/raycluster_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"crypto/sha1"
2323
"encoding/base64"
2424

25-
"github.com/project-codeflare/codeflare-operator/pkg/config"
2625
rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
2726

2827
corev1 "k8s.io/api/core/v1"
@@ -42,6 +41,8 @@ import (
4241
routev1 "github.com/openshift/api/route/v1"
4342
routeapply "github.com/openshift/client-go/route/applyconfigurations/route/v1"
4443
routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
44+
45+
"github.com/project-codeflare/codeflare-operator/pkg/config"
4546
)
4647

4748
// RayClusterReconciler reconciles a RayCluster object
@@ -64,8 +65,8 @@ const (
6465
)
6566

6667
var (
67-
deletePolicy = metav1.DeletePropagationForeground
68-
deleteOptions = client.DeleteOptions{PropagationPolicy: &deletePolicy}
68+
deletePolicy = metav1.DeletePropagationForeground
69+
deleteOptions = client.DeleteOptions{PropagationPolicy: &deletePolicy}
6970
configInstance *config.CodeFlareOperatorConfiguration
7071
)
7172

@@ -328,4 +329,3 @@ func (r *RayClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
328329
For(&rayv1.RayCluster{}).
329330
Complete(r)
330331
}
331-

pkg/controllers/support.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
ctrl "sigs.k8s.io/controller-runtime"
10-
119
"github.com/go-logr/logr"
12-
routeapply "github.com/openshift/client-go/route/applyconfigurations/route/v1"
1310
rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
1411

1512
networkingv1 "k8s.io/api/networking/v1"
@@ -21,6 +18,9 @@ import (
2118
"k8s.io/client-go/discovery"
2219
"k8s.io/client-go/kubernetes"
2320
"k8s.io/client-go/rest"
21+
ctrl "sigs.k8s.io/controller-runtime"
22+
23+
routeapply "github.com/openshift/client-go/route/applyconfigurations/route/v1"
2424
)
2525

2626
func serviceNameFromCluster(cluster *rayv1.RayCluster) string {

0 commit comments

Comments
 (0)