fix operator: remove unused mutating and conversion webhook configs #1705
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
and move validating webhook's Service to `ray-system` namespace instead of `system`.
davidxia
force-pushed
the
webhooks-cleanup
branch
from
388d988
to
2c1960f
Compare
davidxia
commented
Dec 2, 2023
Comment on lines
-114
to
-118
| install-with-webhooks: manifests kustomize ## Install CRDs with webhooks into the K8s cluster specified in ~/.kube/config. | ||
| ($(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/crd-with-webhooks | kubectl create -f -) || ($(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/crd-with-webhooks | kubectl replace -f -) | ||
|
|
||
| uninstall-with-webhooks: manifests kustomize ## Uninstall CRDs with webhooks from the K8s cluster specified in ~/.kube/config. | ||
| $(KUSTOMIZE) build --load-restrictor LoadRestrictionsNone config/crd-with-webhooks | kubectl delete -f - |
There was a problem hiding this comment.
no need because CRDs don't need any changes. config/crd-with-webhooks is only needed for conversion webhooks which we don't use
Comment on lines
-23
to
-32
| //+kubebuilder:webhook:path=/mutate-ray-io-v1-raycluster,mutating=true,failurePolicy=fail,sideEffects=None,groups=ray.io,resources=rayclusters,verbs=create;update,versions=v1,name=mraycluster.kb.io,admissionReviewVersions=v1 | ||
|
|
||
| var _ webhook.Defaulter = &RayCluster{} | ||
|
|
||
| // Default implements webhook.Defaulter so a webhook will be registered for the type | ||
| func (r *RayCluster) Default() { | ||
| rayclusterlog.Info("default", "name", r.Name) | ||
|
|
||
| // TODO(user): fill in your defaulting logic. | ||
| } |
There was a problem hiding this comment.
for mutating webhook which we don't use
Comment on lines
+8
to
+16
| patches: | ||
| - patch: |- | ||
| - op: replace | ||
| path: /webhooks/0/clientConfig/service/namespace | ||
| value: ray-system | ||
| target: | ||
| kind: ValidatingWebhookConfiguration | ||
| name: validating-webhook-configuration | ||
| version: v1 |
There was a problem hiding this comment.
webhook generator hardcodes the namespace of the service to system (issue). We change it to ray-system
| @@ -10,7 +10,7 @@ metadata: | |||
| app.kubernetes.io/part-of: ray-operator | |||
| app.kubernetes.io/managed-by: kustomize | |||
| name: webhook-service | |||
| namespace: system | |||
| namespace: ray-system | |||
There was a problem hiding this comment.
this matches the namespace referenced by the ValidatingWebhookConfiguration
|
cc @kevin85421 |
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.
and move validating webhook's Service to
ray-systemnamespace instead ofsystem.cleanup for #1584
tested with
make docker-build docker-push deploy-with-webhooks IMG=eu.gcr.io/my-project/kuberay-operator:$(git rev-parse --short=7 HEAD)and thenkubectl apply -fthe YAML hereChecks