Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 enhanced ud verification of cloneset #1608

Closed
wants to merge 2 commits into from
Closed

🐛 enhanced ud verification of cloneset #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7caf56d
:bug: enhanced ud verification of cloneset
ls-2018 May 4, 2024
276c70a
Merge branch 'master' into ud
ls-2018 May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/controller/uniteddeployment/revision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
32 changes: 32 additions & 0 deletions pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@
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
Expand Down Expand Up @@ -340,6 +342,19 @@
return allErrs
}
allErrs = append(allErrs, appsvalidation.ValidatePodTemplateSpecForReplicaSet(coreTemplate, nil, 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)...)

Check failure on line 357 in pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

not enough arguments in call to appsvalidation.ValidatePodTemplateSpecForReplicaSet

Check failure on line 357 in pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

not enough arguments in call to appsvalidation.ValidatePodTemplateSpecForReplicaSet

Check failure on line 357 in pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go

View workflow job for this annotation

GitHub Actions / unit-tests 

not enough arguments in call to appsvalidation.ValidatePodTemplateSpecForReplicaSet
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkg/webhook/uniteddeployment/validating/uniteddeployment_validation.go:357:163: not enough arguments in call to appsvalidation.ValidatePodTemplateSpecForReplicaSet

}

return allErrs
Expand Down Expand Up @@ -380,6 +395,14 @@

return allErrs
}
func validateCloneSet(cs *appsv1alpha1.CloneSetTemplateSpec, fldPath *field.Path) field.ErrorList {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check is too simple, is it possible to refer to the cloneset validate webhook?

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{}
Expand Down Expand Up @@ -438,3 +461,12 @@

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
}
Loading