🐛 enhanced ud verification of cloneset

Signed-off-by: acejilam <[email protected]>
openkruise · May 4, 2024 · 7caf56d · 7caf56d
1 parent 879777b
commit 7caf56d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/pkg/controller/uniteddeployment/revision.go b/pkg/controller/uniteddeployment/revision.go
@@ -228,6 +228,8 @@ func (r *ReconcileUnitedDeployment) newRevision(ud *appsalphav1.UnitedDeployment
 		selectedLabels = ud.Spec.Template.AdvancedStatefulSetTemplate.Labels
 	} else if ud.Spec.Template.DeploymentTemplate != nil {
 		selectedLabels = ud.Spec.Template.DeploymentTemplate.Labels
+	} else if ud.Spec.Template.CloneSetTemplate != nil {
+		selectedLabels = ud.Spec.Template.CloneSetTemplate.Labels
 	}
 
 	cr, err := history.NewControllerRevision(ud,

diff --git a/pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go b/pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go
@@ -274,6 +274,8 @@ func validateSubsetTemplateUpdate(template, oldTemplate *appsv1alpha1.SubsetTemp
 		allErrs = append(allErrs, validateAdvancedStatefulSetUpdate(template.AdvancedStatefulSetTemplate, oldTemplate.AdvancedStatefulSetTemplate, fldPath.Child("advancedStatefulSetTemplate"))...)
 	} else if template.DeploymentTemplate != nil && oldTemplate.DeploymentTemplate != nil {
 		allErrs = append(allErrs, validateDeploymentUpdate(template.DeploymentTemplate, oldTemplate.DeploymentTemplate, fldPath.Child("deploymentTemplate"))...)
+	} else if template.CloneSetTemplate != nil && oldTemplate.CloneSetTemplate != nil {
+		allErrs = append(allErrs, validateCloneSetUpdate(template.CloneSetTemplate, oldTemplate.CloneSetTemplate, fldPath.Child("cloneSetTemplate"))...)
 	}
 
 	return allErrs
@@ -340,6 +342,19 @@ func validateSubsetTemplate(template *appsv1alpha1.SubsetTemplate, selector labe
 			return allErrs
 		}
 		allErrs = append(allErrs, appsvalidation.ValidatePodTemplateSpecForReplicaSet(coreTemplate, selector, 0, fldPath.Child("deploymentTemplate", "spec", "template"), webhookutil.DefaultPodValidationOptions)...)
+	} else if template.CloneSetTemplate != nil {
+		labels := labels.Set(template.CloneSetTemplate.Labels)
+		if !selector.Matches(labels) {
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("cloneSetTemplate", "metadata", "labels"), template.CloneSetTemplate.Labels, "`selector` does not match template `labels`"))
+		}
+		allErrs = append(allErrs, validateCloneSet(template.CloneSetTemplate, fldPath.Child("cloneSetTemplate"))...)
+		template := template.CloneSetTemplate.Spec.Template
+		coreTemplate, err := convertor.ConvertPodTemplateSpec(&template)
+		if err != nil {
+			allErrs = append(allErrs, field.Invalid(fldPath.Root(), template, fmt.Sprintf("Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec failed: %v", err)))
+			return allErrs
+		}
+		allErrs = append(allErrs, appsvalidation.ValidatePodTemplateSpecForReplicaSet(coreTemplate, selector, 0, fldPath.Child("cloneSetTemplate", "spec", "template"), webhookutil.DefaultPodValidationOptions)...)
 	}
 
 	return allErrs
@@ -380,6 +395,14 @@ func validateDeployment(deployment *appsv1alpha1.DeploymentTemplateSpec, fldPath
 
 	return allErrs
 }
+func validateCloneSet(cs *appsv1alpha1.CloneSetTemplateSpec, fldPath *field.Path) field.ErrorList {
+	allErrs := field.ErrorList{}
+	if cs.Spec.Replicas != nil {
+		allErrs = append(allErrs, field.Invalid(fldPath.Child("spec", "replicas"), *cs.Spec.Replicas, "replicas in cloneSetTemplate will not be used"))
+	}
+
+	return allErrs
+}
 
 func validateStatefulSetUpdate(statefulSet, oldStatefulSet *appsv1alpha1.StatefulSetTemplateSpec, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
@@ -438,3 +461,12 @@ func validateDeploymentUpdate(deployment, oldDeployment *appsv1alpha1.Deployment
 
 	return allErrs
 }
+func validateCloneSetUpdate(cloneSet, oldCloneSet *appsv1alpha1.CloneSetTemplateSpec, fldPath *field.Path) field.ErrorList {
+	allErrs := field.ErrorList{}
+
+	if cloneSet.Spec.Replicas != nil {
+		allErrs = append(allErrs, apivalidation.ValidateNonnegativeField(int64(*cloneSet.Spec.Replicas), fldPath.Child("spec", "replicas"))...)
+	}
+
+	return allErrs
+}