Skip to content

Auto-Detect kuberay-operator namespace #678

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

Merged
merged 2 commits into from
Apr 15, 2025
Merged

Auto-Detect kuberay-operator namespace #678

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4bc305
Auto-Detect kuberay-operator namespace
szaher Apr 14, 2025
c67bee4
Merge branch 'main' into fix-network-policies
szaher Apr 15, 2025
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
48 changes: 41 additions & 7 deletions pkg/controllers/raycluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,16 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
// - First try to get the ODH / RHOAI application namespace from the DSCInitialization
// - Or fallback to the well-known defaults
// add check if running on openshift or vanilla kubernetes
kubeRayNamespace, err := r.getKubeRayOperatorNamespace(ctx)
if err != nil {
logger.Error(err, "Failed to get KubeRay operator namespace")

return ctrl.Result{RequeueAfter: requeueTime}, err
}
logger.Info("Detected KubeRay operator namespace", "namespace", kubeRayNamespace)

var kubeRayNamespaces []string
kubeRayNamespaces = []string{kubeRayDefaultNamespace}
kubeRayNamespaces = []string{kubeRayNamespace}

if r.IsOpenShift {
dsci := &dsciv1.DSCInitialization{}
Expand All @@ -287,7 +295,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)

}

_, err := r.kubeClient.NetworkingV1().NetworkPolicies(cluster.Namespace).Apply(ctx, desiredHeadNetworkPolicy(cluster, r.Config, kubeRayNamespaces), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
_, err = r.kubeClient.NetworkingV1().NetworkPolicies(cluster.Namespace).Apply(ctx, desiredHeadNetworkPolicy(cluster, r.Config, kubeRayNamespaces), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
if err != nil {
logger.Error(err, "Failed to update NetworkPolicy")
}
Expand Down Expand Up @@ -319,6 +327,32 @@ func isMTLSEnabled(cfg *config.KubeRayConfiguration) bool {
return cfg == nil || ptr.Deref(cfg.MTLSEnabled, true)
}

// getKubeRayOperatorNamespace tries to get the namespace of the KubeRay operator
func (r *RayClusterReconciler) getKubeRayOperatorNamespace(ctx context.Context) (string, error) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want to cover this by a small unit test or dyt it's ok?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the logic should be covered by https://github.com/project-codeflare/codeflare-operator/blob/main/pkg/controllers/raycluster_controller_test.go ?
do you recommend something else?

logger := ctrl.LoggerFrom(ctx)

pods, err := r.kubeClient.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{
LabelSelector: "app.kubernetes.io/component=kuberay-operator",
})
if err != nil {
logger.Error(err, "failed to get kuberay-operator namespace")

return kubeRayDefaultNamespace, err
}

if len(pods.Items) == 0 {
logger.Info(
"No kuberay-operator pods found, using default kuberay-operator namespace",
"namespace",
kubeRayDefaultNamespace,
)

return kubeRayDefaultNamespace, nil
}

return pods.Items[0].Namespace, nil
}

func isRayClusterSuspended(cluster *rayv1.RayCluster) bool {
return cluster.Spec.Suspend != nil && ptr.Deref(cluster.Spec.Suspend, false)
}
Expand Down Expand Up @@ -549,8 +583,8 @@ func desiredHeadNetworkPolicy(cluster *rayv1.RayCluster, cfg *config.KubeRayConf
),
networkingv1ac.NetworkPolicyIngressRule().
WithPorts(
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt(10001)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt(8265)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt32(10001)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt32(8265)),
).WithFrom(
networkingv1ac.NetworkPolicyPeer().WithPodSelector(metav1ac.LabelSelector()),
),
Expand All @@ -564,12 +598,12 @@ func desiredHeadNetworkPolicy(cluster *rayv1.RayCluster, cfg *config.KubeRayConf
WithOperator(metav1.LabelSelectorOpIn).
WithValues(kubeRayNamespaces...)))).
WithPorts(
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt(8265)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt(10001)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt32(8265)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt32(10001)),
),
networkingv1ac.NetworkPolicyIngressRule().
WithPorts(
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt(8080)),
networkingv1ac.NetworkPolicyPort().WithProtocol(corev1.ProtocolTCP).WithPort(intstr.FromInt32(8080)),
).
WithFrom(
networkingv1ac.NetworkPolicyPeer().WithNamespaceSelector(metav1ac.LabelSelector().
Expand Down
Loading