webhook validate v1beta1 rollout

Signed-off-by: liheng.zms <[email protected]>
openkruise · Dec 12, 2023 · ac450c7 · ac450c7
1 parent 9dcf365
commit ac450c7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/api/v1alpha1/conversion.go b/api/v1alpha1/conversion.go
@@ -74,7 +74,8 @@ func (src *Rollout) ConvertTo(dst conversion.Hub) error {
 				obj.Spec.Strategy.Canary.PatchPodTemplateMetadata.Labels[k] = v
 			}
 		}
-		if src.Annotations[RolloutStyleAnnotation] != string(PartitionRollingStyle) {
+		if src.Annotations[RolloutStyleAnnotation] != string(PartitionRollingStyle) &&
+			srcSpec.ObjectRef.WorkloadRef.Kind == "Deployment" {
 			obj.Spec.Strategy.Canary.EnableExtraWorkloadForCanary = true
 		}
 		if src.Annotations[TrafficRoutingAnnotation] != "" {

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -152,6 +152,7 @@ webhooks:
     - rollouts.kruise.io
     apiVersions:
     - v1alpha1
+    - v1beta1
     operations:
     - CREATE
     - UPDATE

diff --git a/pkg/webhook/rollout/validating/rollout_create_update_handler.go b/pkg/webhook/rollout/validating/rollout_create_update_handler.go
@@ -274,13 +274,15 @@ func validateRolloutSpecCanarySteps(steps []appsv1beta1.CanaryStep, fldPath *fie
 		if !isTraffic {
 			continue
 		}
-		if s.Traffic == nil {
-			return field.ErrorList{field.Invalid(fldPath.Index(i).Child("steps"), steps, `traffic cannot be empty`)}
+		if s.Traffic == nil && len(s.Matches) == 0 {
+			return field.ErrorList{field.Invalid(fldPath.Index(i).Child("steps"), steps, `traffic and matches cannot be empty at time same time`)}
 		}
-		is := intstr.FromString(*s.Traffic)
-		weight, err := intstr.GetScaledValueFromIntOrPercent(&is, 100, true)
-		if err != nil || weight <= 0 || weight > 100 {
-			return field.ErrorList{field.Invalid(fldPath.Index(i).Child("steps"), steps, `traffic must be percentage with "0%" < traffic <= "100%"`)}
+		if s.Traffic != nil {
+			is := intstr.FromString(*s.Traffic)
+			weight, err := intstr.GetScaledValueFromIntOrPercent(&is, 100, true)
+			if err != nil || weight <= 0 || weight > 100 {
+				return field.ErrorList{field.Invalid(fldPath.Index(i).Child("steps"), steps, `traffic must be percentage with "0%" < traffic <= "100%"`)}
+			}
 		}
 	}