[Feature] Add ValidateRayClusterSpec to Webhook #2739
+310
−12
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
4 tasks
rueian
reviewed
Jan 13, 2025
ray-operator/apis/ray/v1/constant.go
Outdated
| const RAY_REDIS_ADDRESS = "RAY_REDIS_ADDRESS" | ||
|
|
||
| // Ray GCS FT related annotations | ||
| const RayFTEnabledAnnotationKey = "ray.io/ft-enabled" |
There was a problem hiding this comment.
Can you create references to them with the same name in the package utils?
I think it should be something like this
package utils
const RayContainerIndex = rayv1.RayContainerIndexThere was a problem hiding this comment.
Sorry, I have a misunderstanding
|
rueian
reviewed
Jan 13, 2025
| } | ||
| if r.Annotations[RayFTEnabledAnnotationKey] != "true" && | ||
| len(r.Spec.HeadGroupSpec.Template.Spec.Containers) > 0 && | ||
| r.Spec.HeadGroupSpec.Template.Spec.Containers[RayContainerIndex].Env != nil { |
There was a problem hiding this comment.
r.Spec.HeadGroupSpec.Template.Spec.Containers[RayContainerIndex].Env != nil check is not necessary.
| return field.Invalid( | ||
| field.NewPath("spec").Child("gcsFaultToleranceOptions"), | ||
| r.Spec.GcsFaultToleranceOptions, | ||
| fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s is disabled", RayFTEnabledAnnotationKey), |
There was a problem hiding this comment.
when %s is disabled might be confusing.
Suggested change
| fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s is disabled", RayFTEnabledAnnotationKey), | |
| fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s annotation is set to false", RayFTEnabledAnnotationKey), |
| return field.Invalid( | ||
| field.NewPath("spec").Child("headGroupSpec").Child("template").Child("spec").Child("containers").Index(0).Child("env"), | ||
| RAY_REDIS_ADDRESS, | ||
| fmt.Sprintf("%s should not be set when %s is disabled", RAY_REDIS_ADDRESS, RayFTEnabledAnnotationKey), |
There was a problem hiding this comment.
Suggested change
| fmt.Sprintf("%s should not be set when %s is disabled", RAY_REDIS_ADDRESS, RayFTEnabledAnnotationKey), | |
| fmt.Sprintf("%s environment variable should not be set when %s annotation is not set to true", RAY_REDIS_ADDRESS, RayFTEnabledAnnotationKey), |
…y func and variables to /ray/v1
…y and change confusing message
CheyuWu
force-pushed
the
feat/gcsFT/webhook_val
branch
from
e579e66 to
ce2c194
Compare
|
rueian
approved these changes
Jan 14, 2025
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?
ValidateRayClusterSpec validation should also be invoked in the optional validation webhook
constant.goto store some necessary variables which copy fromcontrollers/ray/utilsutils.goto store some necessary functions which copy fromcontrollers/ray/utilsRelated issue number
Closes #2694
Related Discussion:
Checks