Merge pull request #2717 from jackfrancis/validate-one-aks-system-pool

k8s-ci-robot · web-flow · commit bba00cfca3c7 · 2022-10-11T18:06:47.000-07:00
AKS: clarify that one system pool is required
diff --git a/exp/api/v1beta1/azuremanagedmachinepool_webhook.go b/exp/api/v1beta1/azuremanagedmachinepool_webhook.go
@@ -154,10 +154,9 @@ func (m *AzureManagedMachinePool) ValidateUpdate(oldRaw runtime.Object, client c
 	if m.Spec.Mode != string(NodePoolModeSystem) && old.Spec.Mode == string(NodePoolModeSystem) {
 		// validate for last system node pool
 		if err := m.validateLastSystemNodePool(client); err != nil {
-			allErrs = append(allErrs, field.Invalid(
+			allErrs = append(allErrs, field.Forbidden(
 				field.NewPath("Spec", "Mode"),
-				m.Spec.Mode,
-				"Last system node pool cannot be mutated to user node pool"))
+				"Cannot change node pool mode to User, you must have at least one System node pool in your cluster"))
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,9 @@ func (m *AzureManagedMachinePool) ValidateUpdate(oldRaw runtime.Object, client c`
`154`	`154`	`if m.Spec.Mode != string(NodePoolModeSystem) && old.Spec.Mode == string(NodePoolModeSystem) {`
`155`	`155`	`// validate for last system node pool`
`156`	`156`	`if err := m.validateLastSystemNodePool(client); err != nil {`
`157`		`- allErrs = append(allErrs, field.Invalid(`
	`157`	`+ allErrs = append(allErrs, field.Forbidden(`
`158`	`158`	`field.NewPath("Spec", "Mode"),`
`159`		`- m.Spec.Mode,`
`160`		`- "Last system node pool cannot be mutated to user node pool"))`
	`159`	`+ "Cannot change node pool mode to User, you must have at least one System node pool in your cluster"))`
`161`	`160`	`}`
`162`	`161`	`}`
`163`	`162`