Skip to content

Exit CFO initialisation if RayCluster CRD is not available #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Exit CFO initialisation if RayCluster CRD is not available #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b250c8
Adjust olm_tests workflow to create raycluster CRD for deployment
ChristianZaccaria Apr 18, 2024
8035a3b
Refactor CRD check to exit if RayCluster CRD not available
ChristianZaccaria Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/olm_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ jobs:
kubectl create namespace openshift-operators
kubectl create -f .github/resources-olm-upgrade/operatorgroup.yaml

- name: Install Required KubeRay CRDs for Pod Initialisation
run: |
kubectl create -f https://github.com/raw/ray-project/kuberay/v1.1.0/ray-operator/config/crd/bases/ray.io_rayclusters.yaml
# wait for a while to be sure CRDs are installed
sleep 1
kubectl wait --for=condition=Established crd/rayclusters.ray.io --timeout=60s

- name: Deploy latest released CodeFlare operator from OLM
id: deploy
run: |
Expand Down
27 changes: 15 additions & 12 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,16 @@ func main() {
kubeClient, err := kubernetes.NewForConfig(kubeConfig)
exitOnError(err, "unable to create Kubernetes client")

namespace := namespaceOrDie()
// Checking for RayCluster CRD availability to ensure the RayCluster Controller can initialise.
ok, err := hasAPIResourceForGVK(kubeClient.DiscoveryClient, rayv1.GroupVersion.WithKind("RayCluster"))
if err != nil {
exitOnError(err, "Could not determine if RayCluster CR is present on cluster.")
}
if !ok {
exitOnError(fmt.Errorf("RayCluster CRD is not available on the cluster"), "Required CRD not available.")
}

namespace := namespaceOrDie()
exitOnError(loadIntoOrCreate(ctx, kubeClient, namespace, configMapName, cfg), "unable to initialise configuration")

kubeConfig.Burst = int(ptr.Deref(cfg.ClientConnection.Burst, int32(rest.DefaultBurst)))
Expand Down Expand Up @@ -171,18 +179,13 @@ func setupControllers(mgr ctrl.Manager, dc discovery.DiscoveryInterface, cfg *co

exitOnError(controllers.SetupRayClusterWebhookWithManager(mgr, cfg.KubeRay), "error setting up RayCluster webhook")

ok, err := hasAPIResourceForGVK(dc, rayv1.GroupVersion.WithKind("RayCluster"))
if ok {
rayClusterController := controllers.RayClusterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Config: cfg.KubeRay,
IsOpenShift: isOpenShift,
}
exitOnError(rayClusterController.SetupWithManager(mgr), "Error setting up RayCluster controller")
} else if err != nil {
exitOnError(err, "Could not determine if RayCluster CR present on cluster.")
rayClusterController := controllers.RayClusterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Config: cfg.KubeRay,
IsOpenShift: isOpenShift,
}
exitOnError(rayClusterController.SetupWithManager(mgr), "Error setting up RayCluster controller")
}

// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;update
Expand Down