fix: Make .spec.subscriptionID mutable

The field is effectively required, because the former alternative source, the manager credential, was removed in v1.11.0. To allow newer releases to reconcile existing resources, we need to update their .spec.subscriptionID. This change allows the field to be updated.
mesosphere · Feb 16, 2024 · 7e140f9 · 7e140f9
1 parent 739b0f2
commit 7e140f9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 24 deletions.
diff --git a/api/v1beta1/azurecluster_webhook.go b/api/v1beta1/azurecluster_webhook.go
@@ -63,13 +63,6 @@ func (c *AzureCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings
 		allErrs = append(allErrs, err)
 	}
 
-	if err := webhookutils.ValidateImmutable(
-		field.NewPath("Spec", "SubscriptionID"),
-		old.Spec.SubscriptionID,
-		c.Spec.SubscriptionID); err != nil {
-		allErrs = append(allErrs, err)
-	}
-
 	if err := webhookutils.ValidateImmutable(
 		field.NewPath("Spec", "Location"),
 		old.Spec.Location,

diff --git a/api/v1beta1/azuremanagedcontrolplane_webhook.go b/api/v1beta1/azuremanagedcontrolplane_webhook.go
@@ -131,13 +131,6 @@ func (mw *azureManagedControlPlaneWebhook) ValidateUpdate(ctx context.Context, o
 		return nil, apierrors.NewBadRequest("expected an AzureManagedControlPlane")
 	}
 
-	if err := webhookutils.ValidateImmutable(
-		field.NewPath("Spec", "SubscriptionID"),
-		old.Spec.SubscriptionID,
-		m.Spec.SubscriptionID); err != nil {
-		allErrs = append(allErrs, err)
-	}
-
 	if err := webhookutils.ValidateImmutable(
 		field.NewPath("Spec", "ResourceGroupName"),
 		old.Spec.ResourceGroupName,

diff --git a/api/v1beta1/azuremanagedcontrolplane_webhook_test.go b/api/v1beta1/azuremanagedcontrolplane_webhook_test.go
@@ -1574,7 +1574,7 @@ func TestAzureManagedControlPlane_ValidateUpdate(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "AzureManagedControlPlane SubscriptionID is immutable",
+			name: "AzureManagedControlPlane SubscriptionID is mutable",
 			oldAMCP: &AzureManagedControlPlane{
 				Spec: AzureManagedControlPlaneSpec{
 					AzureManagedControlPlaneClassSpec: AzureManagedControlPlaneClassSpec{
@@ -1593,7 +1593,7 @@ func TestAzureManagedControlPlane_ValidateUpdate(t *testing.T) {
 					},
 				},
 			},
-			wantErr: true,
+			wantErr: false,
 		},
 		{
 			name: "AzureManagedControlPlane ResourceGroupName is immutable",

diff --git a/api/v1beta1/azuremanagedcontrolplanetemplate_webhook.go b/api/v1beta1/azuremanagedcontrolplanetemplate_webhook.go
@@ -87,12 +87,6 @@ func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateUpdate(ctx context.
 	if !ok {
 		return nil, apierrors.NewBadRequest("expected an AzureManagedControlPlaneTemplate")
 	}
-	if err := webhookutils.ValidateImmutable(
-		field.NewPath("Spec", "Template", "Spec", "SubscriptionID"),
-		old.Spec.Template.Spec.SubscriptionID,
-		mcp.Spec.Template.Spec.SubscriptionID); err != nil {
-		allErrs = append(allErrs, err)
-	}
 
 	if err := webhookutils.ValidateImmutable(
 		field.NewPath("Spec", "Template", "Spec", "Location"),

diff --git a/api/v1beta1/azuremanagedcontrolplanetemplate_webhook_test.go b/api/v1beta1/azuremanagedcontrolplanetemplate_webhook_test.go
@@ -79,14 +79,14 @@ func TestControlPlaneTemplateUpdateWebhook(t *testing.T) {
 			wantErr:                 false,
 		},
 		{
-			name: "azuremanagedcontrolplanetemplate subscriptionID is immutable",
+			name: "azuremanagedcontrolplanetemplate subscriptionID is mutable",
 			oldControlPlaneTemplate: getAzureManagedControlPlaneTemplate(func(cpt *AzureManagedControlPlaneTemplate) {
 				cpt.Spec.Template.Spec.SubscriptionID = "foo"
 			}),
 			controlPlaneTemplate: getAzureManagedControlPlaneTemplate(func(cpt *AzureManagedControlPlaneTemplate) {
 				cpt.Spec.Template.Spec.SubscriptionID = "bar"
 			}),
-			wantErr: true,
+			wantErr: false,
 		},
 		{
 			name: "azuremanagedcontrolplanetemplate location is immutable",