feat(validation): add webhook validations for CVC replica scale #1621
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,7 +66,6 @@ func validateCVCSpecChanges(cvcOldObj, cvcNewObj *apis.CStorVolumeClaim) error { | |
| validateFuncList := []validateFunc{validateReplicaCount, | ||
| validatePoolListChanges, | ||
| validateReplicaScaling, | ||
| } | ||
| for _, f := range validateFuncList { | ||
| err := f(cvcOldObj, cvcNewObj) | ||
|
|
@@ -106,12 +105,14 @@ func validateReplicaCount(cvcOldObj, cvcNewObj *apis.CStorVolumeClaim) error { | |
| // validatePoolListChanges returns error if user modified existing pool names with new | ||
| // pool name(s) or if user performed more than one replica scale down at a time | ||
| func validatePoolListChanges(cvcOldObj, cvcNewObj *apis.CStorVolumeClaim) error { | ||
| // Check the new CVC spec changes with old CVC status(Comparing with status | ||
| // is more appropriate than comparing with spec) | ||
| oldCurrentPoolNames := cvcOldObj.Status.PoolInfo | ||
| newDesiredPoolNames := cvc.GetDesiredReplicaPoolNames(cvcNewObj) | ||
| modifiedPoolNames := util.ListDiff(oldCurrentPoolNames, newDesiredPoolNames) | ||
| if len(newDesiredPoolNames) >= len(oldCurrentPoolNames) { | ||
| // If no.of pools on new spec >= no.of pools in old status(scaleup as well | ||
| // as migration case then all the pools in old status must present in new | ||
| // spec) | ||
| if len(modifiedPoolNames) > 0 { | ||
| return errors.Errorf( | ||
|
|
@@ -120,7 +121,7 @@ func validatePoolListChanges(cvcOldObj, cvcNewObj *apis.CStorVolumeClaim) error | |
| ) | ||
| } | ||
| } else { | ||
| // If no.of pools in new spec < no.of pools in old status(scale down | ||
| // volume replica case) then there should at most one change in | ||
| // oldSpec.PoolInfo - newSpec.PoolInfo | ||
| if len(modifiedPoolNames) > 1 { | ||
|
|
@@ -130,6 +131,23 @@ func validatePoolListChanges(cvcOldObj, cvcNewObj *apis.CStorVolumeClaim) error | |
| ) | ||
| } | ||
| } | ||
| // Reject the request if someone perform scaling when CVC is not in Bound | ||
| // state | ||
| // NOTE: We should not reject the controller request which Updates status as | ||
| // Bound as well as pool info in status and spec | ||
| // TODO: Make below check as cvcOldObj.ISBound() | ||
| // If CVC Status is not bound then reject | ||
| if cvcOldObj.Status.Phase != apis.CStorVolumeClaimPhaseBound { | ||
| // If controller is updating pool info then new CVC will be in bound state | ||
| if cvcNewObj.Status.Phase != apis.CStorVolumeClaimPhaseBound && | ||
|
There was a problem hiding this comment. you can remove this check There was a problem hiding this comment. We can't remove this check if we remove then update from CVC controller filling [pool info] |
||
| // Performed scaling operation on CVC | ||
| len(oldCurrentPoolNames) != len(newDesiredPoolNames) { | ||
| return errors.Errorf( | ||
| "Can't perform scaling of volume replicas when CVC is not in %s state", | ||
| apis.CStorVolumeClaimPhaseBound, | ||
| ) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -148,30 +166,6 @@ func validateReplicaScaling(cvcOldObj, cvcNewObj *apis.CStorVolumeClaim) error { | |
| return nil | ||
| } | ||
|
|
||
| // validatePoolNames returns error if there is repeatition of pool names either | ||
| // under spec or status of cvc | ||
| func validatePoolNames(cvcObj *apis.CStorVolumeClaim) error { | ||
|
|
||
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
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.
move this new changes to top of function