Merge pull request #8025 from killianmuldoon/pr-exvars-block-inline-patch-name

k8s-ci-robot · web-flow · commit a613700e1dc9 · 2023-02-02T13:16:42.000-08:00
🌱  Make 'inline' a reserved name for patches
diff --git a/internal/webhooks/patch_validation.go b/internal/webhooks/patch_validation.go
@@ -69,6 +69,14 @@ func validatePatchName(patch clusterv1.ClusterClassPatch, names sets.Set[string]
 			),
 		)
 	}
+	if patch.Name == clusterv1.VariableDefinitionFromInline {
+		allErrs = append(allErrs,
+			field.Required(
+				path.Child("name"),
+				fmt.Sprintf("%q can not be used as the name of a patch", clusterv1.VariableDefinitionFromInline),
+			),
+		)
+	}
 
 	if names.Has(patch.Name) {
 		allErrs = append(allErrs,

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,14 @@ func validatePatchName(patch clusterv1.ClusterClassPatch, names sets.Set[string]`
`69`	`69`	`),`
`70`	`70`	`)`
`71`	`71`	`}`
	`72`	`+ if patch.Name == clusterv1.VariableDefinitionFromInline {`
	`73`	`+ allErrs = append(allErrs,`
	`74`	`+ field.Required(`
	`75`	`+ path.Child("name"),`
	`76`	`+ fmt.Sprintf("%q can not be used as the name of a patch", clusterv1.VariableDefinitionFromInline),`
	`77`	`+ ),`
	`78`	`+ )`
	`79`	`+ }`
`72`	`80`
`73`	`81`	`if names.Has(patch.Name) {`
`74`	`82`	`allErrs = append(allErrs,`