openkruise
/
rollouts
mirror of https://github.com/openkruise/rollouts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'openkruise:master' into Siyuan_branch

This commit is contained in:
Siyuan Chen 2023-05-20 21:42:09 -07:00 committed by GitHub
parent 09c15701f4 5626a7fbb8
commit c1cdf879a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/webhook/rollout/validating/rollout_create_update_handler.go
View File

@ -240,9 +240,11 @@ func validateRolloutSpecCanarySteps(steps []appsv1alpha1.CanaryStep, fldPath *fi
}
if s.Replicas != nil {
canaryReplicas, err := intstr.GetScaledValueFromIntOrPercent(s.Replicas, 100, true)
if err != nil || canaryReplicas <= 0 || canaryReplicas > 100 {
return field.ErrorList{field.Invalid(fldPath.Index(i).Child("CanaryReplicas"),
s.Replicas, `canaryReplicas must be positive number with with "0" < canaryReplicas <= "100", or a percentage with "0%" < canaryReplicas <= "100%"`)}
if err != nil ||
canaryReplicas <= 0 ||
(canaryReplicas > 100 && s.Replicas.Type == intstr.String) {
return field.ErrorList{field.Invalid(fldPath.Index(i).Child("Replicas"),
s.Replicas, `replicas must be positive number, or a percentage with "0%" < canaryReplicas <= "100%"`)}
}
}
}

6
pkg/webhook/rollout/validating/rollout_create_update_handler_test.go
View File

@ -72,6 +72,12 @@ var (
{
Weight: utilpointer.Int32Ptr(100),
},
{
Weight: utilpointer.Int32Ptr(101),
},
{
Weight: utilpointer.Int32Ptr(200),
},
},
TrafficRoutings: []*appsv1alpha1.TrafficRouting{
{