Move matching labels to association.go #2734
Open
+68
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: owenowenisme <[email protected]>
owenowenisme
force-pushed
the
move-matchingLabels-to-association.go
branch
from
f89cc2d to
9e9031f
Compare
|
@rueian please take a look🙏🙏🙏 |
|
Hi @owenowenisme, I noticed that there are |
Signed-off-by: owenowenisme <[email protected]>
rueian
reviewed
Jan 13, 2025
| @@ -100,6 +100,16 @@ func RayClusterWorkerPodsAssociationOptions(instance *rayv1.RayCluster) Associat | |||
| } | |||
| } | |||
|
|
|||
| func RayClusterRedisPodsAssociationOptions(instance *rayv1.RayCluster) AssociationOptions { | |||
There was a problem hiding this comment.
Could you add a test for this new method?
Signed-off-by: owenowenisme <[email protected]>
Signed-off-by: owenowenisme <[email protected]>
rueian
approved these changes
Jan 14, 2025
kevin85421
requested changes
Jan 15, 2025
| utils.RayNodeTypeLabelKey: "head", | ||
| } | ||
| if err := r.List(ctx, &rayHeadSvc, client.InNamespace(instance.Namespace), filterLabels); err != nil { | ||
| filterLabels := common.RayClusterAllPodsAssociationOptions(instance).ToListOptions() |
There was a problem hiding this comment.
Use RayClusterHeadServiceListOptions instead?
| @@ -544,9 +544,9 @@ func (r *RayClusterReconciler) reconcileIngressKubernetes(ctx context.Context, i | |||
| func (r *RayClusterReconciler) reconcileHeadService(ctx context.Context, instance *rayv1.RayCluster) error { | |||
| logger := ctrl.LoggerFrom(ctx) | |||
| services := corev1.ServiceList{} | |||
| filterLabels := client.MatchingLabels{utils.RayClusterLabelKey: instance.Name, utils.RayNodeTypeLabelKey: string(rayv1.HeadNode)} | |||
| filterLabels := common.RayClusterHeadPodsAssociationOptions(instance).ToListOptions() | |||
There was a problem hiding this comment.
Suggested change
| filterLabels := common.RayClusterHeadPodsAssociationOptions(instance).ToListOptions() | |
| filterLabels := common.RayClusterHeadServiceListOptions(instance).ToListOptions() |
| @@ -286,9 +286,9 @@ func (r *RayClusterReconciler) rayClusterReconcile(ctx context.Context, instance | |||
| } | |||
|
|
|||
| // We can start the Redis cleanup process now because the head Pod has been terminated. | |||
| filterLabels := client.MatchingLabels{utils.RayClusterLabelKey: instance.Name, utils.RayNodeTypeLabelKey: string(rayv1.RedisCleanupNode)} | |||
| filterLabels := common.RayClusterRedisPodsAssociationOptions(instance).ToListOptions() | |||
There was a problem hiding this comment.
- It is used to associate a K8s Job instead of Pod.
- It is not a Redis Pod.
Please rename to RayClusterRedisCleanupJobAssociationOptions
| @@ -481,8 +481,8 @@ func (r *RayClusterReconciler) reconcileIngress(ctx context.Context, instance *r | |||
| func (r *RayClusterReconciler) reconcileRouteOpenShift(ctx context.Context, instance *rayv1.RayCluster) error { | |||
| logger := ctrl.LoggerFrom(ctx) | |||
| headRoutes := routev1.RouteList{} | |||
| filterLabels := client.MatchingLabels{utils.RayClusterLabelKey: instance.Name} | |||
| if err := r.List(ctx, &headRoutes, client.InNamespace(instance.Namespace), filterLabels); err != nil { | |||
| filterLabels := common.RayClusterAllPodsAssociationOptions(instance).ToListOptions() | |||
There was a problem hiding this comment.
It's misleading to use RayClusterAllPodsAssociationOptions to associate K8s ingress / route. Please create a new function RayClusterNetworkResourcesOptions for both ingress and route instead.
Signed-off-by: owenowenisme <[email protected]>
owenowenisme
force-pushed
the
move-matchingLabels-to-association.go
branch
from
4fa5f6a to
1c1c6b7
Compare
rueian
reviewed
Jan 15, 2025
| @@ -194,3 +194,12 @@ func GetRayClusterHeadPod(ctx context.Context, reader client.Reader, instance *r | |||
| } | |||
| return &runtimePods.Items[0], nil | |||
| } | |||
|
|
|||
| func RayClusterNetworkResourcesOptions(instance *rayv1.RayCluster) AssociationOptions { | |||
There was a problem hiding this comment.
Since the new function is created, please add a test for it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why are these changes needed?
#2733
Related issue number
Closes #2733
Checks