fix(cspc, webhook): add validation for cspc deletion #1594
Merged
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
shubham14bajpai
requested review from
sonasingh46,
prateekpandey14 and
mittachaitu
mittachaitu
reviewed
Jan 27, 2020
pkg/webhook/configuration.go
Outdated
| @@ -447,7 +448,7 @@ func preUpgrade(openebsNamespace string) error { | |||
| } | |||
|
|
|||
| for _, service := range svcList.Items { | |||
| if len(service.Labels["openebs.io/version"]) == 0 { | |||
| if service.Labels["openebs.io/version"] != version.Current() { | |||
There was a problem hiding this comment.
Why does service need to be deleted for every upgrade?
There was a problem hiding this comment.
No, we should not
pkg/webhook/configuration.go
Outdated
| @@ -460,7 +461,7 @@ func preUpgrade(openebsNamespace string) error { | |||
| } | |||
|
|
|||
| for _, config := range webhookConfigList.Items { | |||
| if len(config.Labels["openebs.io/version"]) == 0 { | |||
| if config.Labels["openebs.io/version"] != version.Current() { | |||
There was a problem hiding this comment.
Instead of deleting for every upgrade can't we handle with patch/update call?
cc: @prateekpandey14
There was a problem hiding this comment.
Yes, better to patch/update instead of delete based on version
golangcibot
reviewed
Jan 27, 2020
mittachaitu
reviewed
Jan 28, 2020
Signed-off-by: shubham <[email protected]>
Signed-off-by: shubham <[email protected]>
Signed-off-by: shubham <[email protected]>
Signed-off-by: shubham <[email protected]>
Signed-off-by: shubham <[email protected]>
Signed-off-by: shubham <[email protected]>
shubham14bajpai
force-pushed
the
cspc_webhook
branch
from
309900e to
30405ac
Compare
Signed-off-by: shubham <[email protected]>
vishnuitta
reviewed
Jan 28, 2020
pkg/webhook/cspc.go
Outdated
| return response | ||
| } | ||
| for _, cspiObj := range cspiList.Items { | ||
| cvrList, err := cvr.NewKubeclient().WithNamespace(cspiObj.Namespace).List(metav1.ListOptions{ |
There was a problem hiding this comment.
CVRs seems to be created in openebs namespace rather than cspiObj namespace.. so, list can fail here
There was a problem hiding this comment.
As the same container is having controllers for CSPI and CVR, shouldn't they be created in same namespace?
Signed-off-by: shubham <[email protected]>
vishnuitta
reviewed
Jan 29, 2020
| for i, rule := range config.Webhooks[0].Rules { | ||
| if util.ContainsString(rule.Rule.Resources, "cstorpoolclusters") { | ||
| index = i | ||
| } |
Signed-off-by: shubham <[email protected]>
shubham14bajpai
force-pushed
the
cspc_webhook
branch
from
889826b to
9a5cc80
Compare
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.
Signed-off-by: shubham [email protected]
What this PR does / why we need it:
This PR adds validation for cspc deletion. When a volume is still present on the cspc pool the deletion of cspc should not be allowed.
mayadata:setup$ k delete cspc --all Error from server (BadRequest): admission webhook "admission-webhook.openebs.io" denied the request: invalid cspc sparse-pool-1 deletion: volume still exists on pool sparse-pool-1-ff87This PR also fixes the pre-upgrade cleanup or update of webhook secret, service, and validator.
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
Checklist:
documentationtagbreaking-changestagrequires-upgradetag