fixup! propagate k8s version from AzureASOManagedControlPlane to ManagedCluster

nojnhuh · nojnhuh · commit bbc4d0c067ee · 2024-04-30T21:51:43.000Z
diff --git a/exp/mutators/azureasomanagedcontrolplane.go b/exp/mutators/azureasomanagedcontrolplane.go
@@ -76,7 +76,7 @@ func setManagedClusterKubernetesVersion(ctx context.Context, asoManagedControlPl
 
 	capzK8sVersion := strings.TrimPrefix(asoManagedControlPlane.Spec.Version, "v")
 	if capzK8sVersion == "" {
-		// If there is no CAPI opinion, users can do whatever they want.
+		// When the CAPI contract field isn't set, any value for version in the embedded ASO resource may be specified.
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func setManagedClusterKubernetesVersion(ctx context.Context, asoManagedControlPl`
`76`	`76`
`77`	`77`	`capzK8sVersion := strings.TrimPrefix(asoManagedControlPlane.Spec.Version, "v")`
`78`	`78`	`if capzK8sVersion == "" {`
`79`		`- // If there is no CAPI opinion, users can do whatever they want.`
	`79`	`+ // When the CAPI contract field isn't set, any value for version in the embedded ASO resource may be specified.`
`80`	`80`	`return nil`
`81`	`81`	`}`
`82`	`82`