add dsci to schema instead of odh

Signed-off-by: Kevin <kpostlet@redhat.com>

Author: KPostOffice

config/rbac/role.yaml

@@ -46,6 +46,12 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - dscinitialization.opendatahub.io
+  resources:
+  - dscinitializations
+  verbs:
+  - get
 - apiGroups:
   - networking.k8s.io
   resources:
@@ -56,12 +62,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - dscinitialization.opendatahub.io
-  resources:
-  - dscinitializations
-  verbs:
-  - get
 - apiGroups:
   - ray.io
   resources:

main.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	odhv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
+	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 	"go.uber.org/zap/zapcore"
 
@@ -72,7 +72,7 @@ func init() {
 	// OpenShift Route
 	utilruntime.Must(routev1.Install(scheme))
 	// ODH
-	utilruntime.Must(odhv1.AddToScheme(scheme))
+	utilruntime.Must(dsciv1.AddToScheme(scheme))
 }
 
 func main() {

pkg/controllers/raycluster_controller.go

@@ -223,7 +223,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		kubeRayNamespaces = []string{dsci.Spec.ApplicationsNamespace}
 	}
 
-	_, err = r.kubeClient.NetworkingV1().NetworkPolicies(cluster.Namespace).Apply(ctx, desiredNetworkPolicy(&cluster, kubeRayNamespaces), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
+	_, err = r.kubeClient.NetworkingV1().NetworkPolicies(cluster.Namespace).Apply(ctx, desiredNetworkPolicy(cluster, kubeRayNamespaces), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
 	if err != nil {
 		logger.Error(err, "Failed to update NetworkPolicy")
 	}

pkg/controllers/raycluster_webhook.go

@@ -24,7 +24,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -66,7 +66,7 @@ var _ webhook.CustomValidator = &rayClusterWebhook{}
 func (w *rayClusterWebhook) Default(ctx context.Context, obj runtime.Object) error {
 	rayCluster := obj.(*rayv1.RayCluster)
 
-	if !pointer.BoolDeref(w.Config.RayDashboardOAuthEnabled, true) {
+	if !ptr.Deref(w.Config.RayDashboardOAuthEnabled, true) {
 		return nil
 	}
 
@@ -143,7 +143,7 @@ func validateOAuthProxyVolume(rayCluster *rayv1.RayCluster) field.ErrorList {
 func validateIngress(rayCluster *rayv1.RayCluster) field.ErrorList {
 	var allErrors field.ErrorList
 
-	if pointer.BoolDeref(rayCluster.Spec.HeadGroupSpec.EnableIngress, false) {
+	if ptr.Deref(rayCluster.Spec.HeadGroupSpec.EnableIngress, false) {
 		allErrors = append(allErrors, field.Invalid(
 			field.NewPath("spec", "headGroupSpec", "enableIngress"),
 			rayCluster.Spec.HeadGroupSpec.EnableIngress,