-
Notifications
You must be signed in to change notification settings - Fork 104
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.
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
Reintroduce 366222d (#1207) #1232
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,78 @@ | ||
| package v1beta1 | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/http" | ||
| "reflect" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/api/admission/v1beta1" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook/admission" | ||
|
|
||
| "github.com/kudobuilder/kudo/pkg/util/kudo" | ||
| ) | ||
|
|
||
| // this forces the instance type to implement Validator interface, we'll get compile time error if it's not true anymore | ||
| var _ kudo.Validator = &Instance{} | ||
| // +k8s:deepcopy-gen=false | ||
|
|
||
| // ValidateCreate implements kudo.Validator (slightly tweaked interface originally from controller-runtime) | ||
| // we do not enforce any rules upon creation right now | ||
| func (i *Instance) ValidateCreate(req admission.Request) error { | ||
| return nil | ||
| // InstanceValidator holds the data for the instance validator hook | ||
| type InstanceValidator struct { | ||
| client client.Client | ||
| decoder *admission.Decoder | ||
| } | ||
|
|
||
| // ValidateUpdate hook called when UPDATE operation is triggered and our admission webhook is triggered | ||
| // ValidateUpdate implements kudo.Validator (slightly tweaked interface originally from controller-runtime) | ||
| func (i *Instance) ValidateUpdate(old runtime.Object, req admission.Request) error { | ||
| oldInstance := old.(*Instance) | ||
| if i.Status.AggregatedStatus.Status.IsRunning() && specChanged(i.Spec, oldInstance.Spec) { | ||
| // when updating anything else than status, there shouldn't be a running plan | ||
| return fmt.Errorf("cannot update Instance %s/%s right now, there's plan %s in progress", i.Namespace, i.Name, i.Status.AggregatedStatus.ActivePlanName) | ||
| // InstanceValidator validates updates to an Instance, guarding from conflicting plan executions | ||
| func (v *InstanceValidator) Handle(ctx context.Context, req admission.Request) admission.Response { | ||
|
|
||
| switch req.Operation { | ||
| // we only validate Instance Updates | ||
| case v1beta1.Update: | ||
| old, new := &Instance{}, &Instance{} | ||
|
|
||
| // req.Object contains the updated object | ||
| if err := v.decoder.DecodeRaw(req.Object, new); err != nil { | ||
| return admission.Errored(http.StatusBadRequest, err) | ||
| } | ||
|
|
||
| // req.OldObject is populated for DELETE and UPDATE requests | ||
| if err := v.decoder.DecodeRaw(req.OldObject, old); err != nil { | ||
| return admission.Errored(http.StatusBadRequest, err) | ||
| } | ||
|
|
||
| if err := validateUpdate(old, new); err != nil { | ||
| return admission.Denied(err.Error()) | ||
| } | ||
| return admission.Allowed("") | ||
| default: | ||
| return admission.Allowed("") | ||
| } | ||
| } | ||
|
|
||
| func validateUpdate(old, new *Instance) error { | ||
| // Disallow spec updates when a plan is in progress | ||
| if old.Status.AggregatedStatus.Status.IsRunning() && specChanged(old.Spec, new.Spec) { | ||
| return fmt.Errorf("cannot update Instance %s/%s right now, there's plan %s in progress", old.Namespace, old.Name, old.Status.AggregatedStatus.ActivePlanName) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func specChanged(old InstanceSpec, new InstanceSpec) bool { | ||
| return !reflect.DeepEqual(old, new) | ||
| } | ||
|
|
||
| // ValidateDelete hook called when DELETE operation is triggered and our admission webhook is triggered | ||
| // we don't enforce any validation on DELETE right now | ||
| // ValidateDelete implements kudo.Validator (slightly tweaked interface originally from controller-runtime) | ||
| func (i *Instance) ValidateDelete(req admission.Request) error { | ||
| // InstanceValidator implements inject.Client. | ||
| // A client will be automatically injected. | ||
|
|
||
| // InjectClient injects the client. | ||
| func (v *InstanceValidator) InjectClient(c client.Client) error { | ||
| v.client = c | ||
| return nil | ||
| } | ||
|
|
||
| // InstanceValidator implements admission.DecoderInjector. | ||
| // A decoder will be automatically injected. | ||
|
|
||
| // InjectDecoder injects the decoder. | ||
| func (v *InstanceValidator) InjectDecoder(d *admission.Decoder) error { | ||
| v.decoder = d | ||
| return nil | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the actual change