Add validation for the nested ObjectMeta fields of cluster class

kubernetes-sigs · Mar 31, 2023 · b2a8841 · b2a8841
1 parent 87784c2
commit b2a8841
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/api/v1beta1/common_validate.go b/api/v1beta1/common_validate.go
@@ -6,6 +6,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
+// Validate validates the labels and annotations in ObjectMeta.
 func (metadata *ObjectMeta) Validate(parent *field.Path) field.ErrorList {
 	allErrs := metav1validation.ValidateLabels(
 		metadata.Labels,

diff --git a/internal/webhooks/clusterclass.go b/internal/webhooks/clusterclass.go
@@ -155,6 +155,9 @@ func (webhook *ClusterClass) validate(ctx context.Context, oldClusterClass, newC
 	// Validate patches.
 	allErrs = append(allErrs, validatePatches(newClusterClass)...)
 
+	// Validate metadata
+	allErrs = append(allErrs, validateClusterClassMetadata(newClusterClass)...)
+
 	// If this is an update run additional validation.
 	if oldClusterClass != nil {
 		// Ensure spec changes are compatible.
@@ -364,3 +367,17 @@ func validateMachineHealthCheckClass(fldPath *field.Path, namepace string, m *cl
 
 	return mhc.ValidateCommonFields(fldPath)
 }
+
+func validateClusterClassMetadata(clusterClass *clusterv1.ClusterClass) field.ErrorList {
+	var allErrs field.ErrorList
+	allErrs = append(allErrs, clusterClass.Spec.ControlPlane.Metadata.Validate(field.NewPath("spec", "controlPlane", "metadata"))...)
+	workerPath := field.NewPath("spec", "workers", "machineDeployments")
+	for idx, m := range clusterClass.Spec.Workers.MachineDeployments {
+		allErrs = append(allErrs, validateMachineDeploymentMetadata(m, workerPath.Index(idx))...)
+	}
+	return allErrs
+}
+
+func validateMachineDeploymentMetadata(m clusterv1.MachineDeploymentClass, fldPath *field.Path) field.ErrorList {
+	return m.Template.Metadata.Validate(fldPath.Child("template", "metadata"))
+}