Update ASO to v2.11.0

bryan-cox · bryan-cox · commit f5db2308b012 · 2025-02-18T15:21:28.000-05:00
This commit updates ASO to v2.11.0 so that CAPZ is using the latest
library version for this dependency.

Signed-off-by: Bryan Cox &lt;brcox@redhat.com&gt;
diff --git a/azure/converters/managedagentpool.go b/azure/converters/managedagentpool.go
@@ -17,7 +17,7 @@ limitations under the License.
 package converters
 
 import (
-	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
+	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
 	"k8s.io/utils/ptr"
 )
 
diff --git a/azure/converters/managedagentpool_test.go b/azure/converters/managedagentpool_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
-	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
+	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/ptr"
@@ -35,7 +35,7 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) {
 		{
 			name: "Should set all values correctly",
 			pool: &asocontainerservicev1hub.ManagedClustersAgentPool{
-				Spec: asocontainerservicev1hub.ManagedClusters_AgentPool_Spec{
+				Spec: asocontainerservicev1hub.ManagedClustersAgentPool_Spec{
 					AzureName:           "agentpool1",
 					VmSize:              ptr.To("Standard_D2s_v3"),
 					OsType:              ptr.To(string(asocontainerservicev1.OSType_Linux)),
diff --git a/azure/converters/subnets_test.go b/azure/converters/subnets_test.go
@@ -38,7 +38,7 @@ func TestGetSubnetAddresses(t *testing.T) {
 		{
 			name: "subnet with single address prefix",
 			subnet: asonetworkv1.VirtualNetworksSubnet{
-				Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
+				Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
 					AddressPrefix: ptr.To("test-address-prefix"),
 				},
 			},
@@ -47,7 +47,7 @@ func TestGetSubnetAddresses(t *testing.T) {
 		{
 			name: "subnet with multiple address prefixes",
 			subnet: asonetworkv1.VirtualNetworksSubnet{
-				Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
+				Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
 					AddressPrefixes: []string{
 						"test-address-prefix-1",
 						"test-address-prefix-2",
diff --git a/azure/services/agentpools/agentpools.go b/azure/services/agentpools/agentpools.go
@@ -19,7 +19,7 @@ package agentpools
 import (
 	"context"
 
-	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
+	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
diff --git a/azure/services/agentpools/agentpools_test.go b/azure/services/agentpools/agentpools_test.go
@@ -49,7 +49,7 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
 		scope.EXPECT().RemoveCAPIMachinePoolAnnotation(clusterv1.ReplicasManagedByAnnotation)
 
 		managedCluster := &asocontainerservicev1.ManagedClustersAgentPool{
-			Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
 				EnableAutoScaling: ptr.To(false),
 			},
 		}
@@ -67,7 +67,7 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
 		scope.EXPECT().SetCAPIMachinePoolReplicas(ptr.To(1234))
 
 		managedCluster := &asocontainerservicev1.ManagedClustersAgentPool{
-			Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
 				EnableAutoScaling: ptr.To(true),
 				Count:             ptr.To(1234),
 			},
@@ -86,7 +86,7 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
 		scope.EXPECT().SetCAPIMachinePoolReplicas(ptr.To(1234))
 
 		agentPool := &asocontainerservicev1preview.ManagedClustersAgentPool{
-			Status: asocontainerservicev1preview.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1preview.ManagedClustersAgentPool_STATUS{
 				EnableAutoScaling: ptr.To(true),
 				Count:             ptr.To(1234),
 			},
diff --git a/azure/services/agentpools/spec.go b/azure/services/agentpools/spec.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
-	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
 	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
+	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/azure/services/agentpools/spec_test.go b/azure/services/agentpools/spec_test.go
@@ -75,7 +75,7 @@ func TestParameters(t *testing.T) {
 			EnableEncryptionAtHost: ptr.To(false),
 		}
 		expected := &asocontainerservicev1.ManagedClustersAgentPool{
-			Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
+			Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
 				AzureName: "azure name",
 				Owner: &genruntime.KnownResourceReference{
 					Name: "cluster",
@@ -171,7 +171,7 @@ func TestParameters(t *testing.T) {
 			EnableEncryptionAtHost: ptr.To(false),
 		}
 		expected := &asocontainerservicev1preview.ManagedClustersAgentPool{
-			Spec: asocontainerservicev1preview.ManagedClusters_AgentPool_Spec{
+			Spec: asocontainerservicev1preview.ManagedClustersAgentPool_Spec{
 				AzureName: "azure name",
 				Owner: &genruntime.KnownResourceReference{
 					Name: "cluster",
@@ -233,14 +233,14 @@ func TestParameters(t *testing.T) {
 			Version:           ptr.To("1.26.6"),
 		}
 		existing := &asocontainerservicev1.ManagedClustersAgentPool{
-			Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
+			Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
 				AzureName: "set by the user",
 				PowerState: &asocontainerservicev1.PowerState{
 					Code: ptr.To(asocontainerservicev1.PowerState_Code("set by the user")),
 				},
 				OrchestratorVersion: ptr.To("1.27.2"),
 			},
-			Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
 				Count: ptr.To(1212),
 			},
 		}
@@ -268,14 +268,14 @@ func TestParameters(t *testing.T) {
 			Preview:           true,
 		}
 		existing := &asocontainerservicev1preview.ManagedClustersAgentPool{
-			Spec: asocontainerservicev1preview.ManagedClusters_AgentPool_Spec{
+			Spec: asocontainerservicev1preview.ManagedClustersAgentPool_Spec{
 				AzureName: "set by the user",
 				PowerState: &asocontainerservicev1preview.PowerState{
 					Code: ptr.To(asocontainerservicev1preview.PowerState_Code("set by the user")),
 				},
 				OrchestratorVersion: ptr.To("1.27.2"),
 			},
-			Status: asocontainerservicev1preview.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1preview.ManagedClustersAgentPool_STATUS{
 				Count: ptr.To(1212),
 			},
 		}
diff --git a/azure/services/bastionhosts/spec.go b/azure/services/bastionhosts/spec.go
@@ -78,12 +78,12 @@ func (s *AzureBastionSpec) Parameters(_ context.Context, existingBastionHost *as
 	bastionHost.Spec.IpConfigurations = []asonetworkv1.BastionHostIPConfiguration{
 		{
 			Name: ptr.To(bastionHostIPConfigName),
-			Subnet: &asonetworkv1.BastionHostSubResource{
+			Subnet: &asonetworkv1.SubResource{
 				Reference: &genruntime.ResourceReference{
 					ARMID: s.SubnetID,
 				},
 			},
-			PublicIPAddress: &asonetworkv1.BastionHostSubResource{
+			PublicIPAddress: &asonetworkv1.SubResource{
 				Reference: &genruntime.ResourceReference{
 					ARMID: s.PublicIPID,
 				},
diff --git a/azure/services/bastionhosts/spec_test.go b/azure/services/bastionhosts/spec_test.go
@@ -46,12 +46,12 @@ var (
 			IpConfigurations: []asonetworkv1.BastionHostIPConfiguration{
 				{
 					Name: ptr.To(fmt.Sprintf("%s-%s", fakeAzureBastionSpec1.Name, "bastionIP")),
-					Subnet: &asonetworkv1.BastionHostSubResource{
+					Subnet: &asonetworkv1.SubResource{
 						Reference: &genruntime.ResourceReference{
 							ARMID: fakeAzureBastionSpec1.SubnetID,
 						},
 					},
-					PublicIPAddress: &asonetworkv1.BastionHostSubResource{
+					PublicIPAddress: &asonetworkv1.SubResource{
 						Reference: &genruntime.ResourceReference{
 							ARMID: fakeAzureBastionSpec1.PublicIPID,
 						},
diff --git a/azure/services/fleetsmembers/spec_test.go b/azure/services/fleetsmembers/spec_test.go
@@ -31,7 +31,7 @@ import (
 
 var (
 	fakeAzureFleetsMember = asocontainerservicev1.FleetsMember{
-		Spec: asocontainerservicev1.Fleets_Member_Spec{
+		Spec: asocontainerservicev1.FleetsMember_Spec{
 			AzureName: fakeAzureFleetsMemberSpec.Name,
 			Owner: &genruntime.KnownResourceReference{
 				ARMID: azure.FleetID(fakeAzureFleetsMemberSpec.SubscriptionID, fakeAzureFleetsMemberSpec.ManagerResourceGroup, fakeAzureFleetsMemberSpec.ManagerName),
@@ -51,7 +51,7 @@ var (
 		ManagerName:          "fake-manager-name",
 		ManagerResourceGroup: "fake-manager-resource-group",
 	}
-	fakeFleetsMemberStatus = asocontainerservicev1.Fleets_Member_STATUS{
+	fakeFleetsMemberStatus = asocontainerservicev1.FleetsMember_STATUS{
 		Name:              ptr.To(fakeAzureFleetsMemberSpec.Name),
 		ProvisioningState: ptr.To(asocontainerservicev1.FleetMemberProvisioningState_STATUS_Succeeded),
 	}
diff --git a/azure/services/managedclusters/managedclusters.go b/azure/services/managedclusters/managedclusters.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
-	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
+	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
diff --git a/azure/services/managedclusters/spec.go b/azure/services/managedclusters/spec.go
@@ -24,8 +24,8 @@ import (
 	"sort"
 
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
-	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
 	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
+	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/azure/services/natgateways/spec.go b/azure/services/natgateways/spec.go
@@ -66,7 +66,7 @@ func (s *NatGatewaySpec) Parameters(_ context.Context, existingNatGateway *asone
 	natGateway.Spec.Sku = &asonetworkv1.NatGatewaySku{
 		Name: ptr.To(asonetworkv1.NatGatewaySku_Name_Standard),
 	}
-	natGateway.Spec.PublicIpAddresses = []asonetworkv1.ApplicationGatewaySubResource{
+	natGateway.Spec.PublicIpAddresses = []asonetworkv1.SubResource{
 		{
 			Reference: &genruntime.ResourceReference{
 				ARMID: azure.PublicIPID(s.SubscriptionID, s.ResourceGroup, s.NatGatewayIP.Name),
diff --git a/azure/services/natgateways/spec_test.go b/azure/services/natgateways/spec_test.go
@@ -62,7 +62,7 @@ var (
 			Owner: &genruntime.KnownResourceReference{
 				Name: "my-rg",
 			},
-			PublicIpAddresses: []asonetworkv1.ApplicationGatewaySubResource{
+			PublicIpAddresses: []asonetworkv1.SubResource{
 				{
 					Reference: &genruntime.ResourceReference{
 						ARMID: "/subscriptions/123/resourceGroups/my-rg/providers/Microsoft.Network/publicIPAddresses/my-natgateway-ip",
@@ -83,7 +83,7 @@ var (
 			Location:             locationPtr,
 			Name:                 ptr.To("my-natgateway"),
 			ProvisioningState:    ptr.To(asonetworkv1.ApplicationGatewayProvisioningState_STATUS_Succeeded),
-			PublicIpAddresses: []asonetworkv1.ApplicationGatewaySubResource_STATUS{
+			PublicIpAddresses: []asonetworkv1.SubResource_STATUS{
 				{
 					Id: ptr.To("/subscriptions/123/resourceGroups/my-rg/providers/Microsoft.Network/publicIPAddresses/my-natgateway-ip"),
 				},
diff --git a/azure/services/subnets/spec.go b/azure/services/subnets/spec.go
@@ -62,7 +62,7 @@ func (s *SubnetSpec) Parameters(_ context.Context, existing *asonetworkv1.Virtua
 		subnet = &asonetworkv1.VirtualNetworksSubnet{}
 	}
 
-	subnet.Spec = asonetworkv1.VirtualNetworks_Subnet_Spec{
+	subnet.Spec = asonetworkv1.VirtualNetworksSubnet_Spec{
 		AzureName: s.Name,
 		Owner: &genruntime.KnownResourceReference{
 			Name: azure.GetNormalizedKubernetesName(s.VNetName),
diff --git a/azure/services/subnets/spec_test.go b/azure/services/subnets/spec_test.go
@@ -58,7 +58,7 @@ func TestParameters(t *testing.T) {
 			},
 			existing: nil,
 			expected: &asonetworkv1.VirtualNetworksSubnet{
-				Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
+				Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
 					AzureName: "subnet",
 					Owner: &genruntime.KnownResourceReference{
 						Name: "vnet",
@@ -110,12 +110,12 @@ func TestParameters(t *testing.T) {
 				},
 			},
 			existing: &asonetworkv1.VirtualNetworksSubnet{
-				Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
+				Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
 					Id: ptr.To("status is preserved"),
 				},
 			},
 			expected: &asonetworkv1.VirtualNetworksSubnet{
-				Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
+				Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
 					AzureName: "subnet",
 					Owner: &genruntime.KnownResourceReference{
 						Name: "vnet",
@@ -144,7 +144,7 @@ func TestParameters(t *testing.T) {
 						},
 					},
 				},
-				Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
+				Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
 					Id: ptr.To("status is preserved"),
 				},
 			},
diff --git a/azure/services/subnets/subnets_test.go b/azure/services/subnets/subnets_test.go
@@ -45,10 +45,10 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
 		scope.EXPECT().UpdateSubnetID("subnet", "id")
 		scope.EXPECT().UpdateSubnetCIDRs("subnet", []string{"cidr"})
 		subnet := &asonetworkv1.VirtualNetworksSubnet{
-			Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
+			Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
 				AzureName: "subnet",
 			},
-			Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
+			Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
 				Id:              ptr.To("id"),
 				AddressPrefixes: []string{"cidr"},
 			},
diff --git a/azure/services/virtualnetworks/virtualnetworks_test.go b/azure/services/virtualnetworks/virtualnetworks_test.go
@@ -75,18 +75,18 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
 						labels.OwnerNameLabel: existing.Name,
 					},
 				},
-				Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
+				Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
 					AzureName: "azure-name",
 				},
-				Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
+				Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
 					AddressPrefixes: []string{"address prefixes"},
 				},
 			},
 			&asonetworkv1.VirtualNetworksSubnet{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "other subnet",
 				},
-				Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
+				Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
 					Owner: &genruntime.KnownResourceReference{
 						Name: "not this vnet",
 					},
diff --git a/controllers/azureasomanagedmachinepool_controller_test.go b/controllers/azureasomanagedmachinepool_controller_test.go
@@ -314,13 +314,13 @@ func TestAzureASOManagedMachinePoolReconcile(t *testing.T) {
 				Name:      "ap",
 				Namespace: cluster.Namespace,
 			},
-			Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
+			Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
 				AzureName: "pool1",
 				Owner: &genruntime.KnownResourceReference{
 					Name: asoManagedCluster.Name,
 				},
 			},
-			Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
 				Count: ptr.To(3),
 			},
 		}
@@ -456,14 +456,14 @@ func TestAzureASOManagedMachinePoolReconcile(t *testing.T) {
 				Name:      "ap",
 				Namespace: cluster.Namespace,
 			},
-			Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
+			Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
 				AzureName: "pool1",
 				Owner: &genruntime.KnownResourceReference{
 					Name: asoManagedCluster.Name,
 				},
 				EnableAutoScaling: ptr.To(true),
 			},
-			Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
+			Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
 				Count: ptr.To(3),
 			},
 		}
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/mutators/azureasomanagedcontrolplane.go b/pkg/mutators/azureasomanagedcontrolplane.go
diff --git a/pkg/mutators/azureasomanagedcontrolplane_test.go b/pkg/mutators/azureasomanagedcontrolplane_test.go
diff --git a/pkg/mutators/azureasomanagedmachinepool_test.go b/pkg/mutators/azureasomanagedmachinepool_test.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`package converters`
`18`	`18`
`19`	`19`	`import (`
`20`		`- asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"`
	`20`	`+ asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"`
`21`	`21`	`"k8s.io/utils/ptr"`
`22`	`22`	`)`
`23`	`23`