Skip to content

Commit f5db230

Browse files
bryan-coxbryan-cox
committed
Update ASO to v2.11.0
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 <[email protected]>
1 parent 202e091 commit f5db230

24 files changed

+105
-96
lines changed

‎azure/converters/managedagentpool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package converters
1818

1919
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"
2121
"k8s.io/utils/ptr"
2222
)
2323

‎azure/converters/managedagentpool_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"testing"
2121

2222
asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
23-
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
23+
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
2424
"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
2525
. "github.com/onsi/gomega"
2626
"k8s.io/utils/ptr"
@@ -35,7 +35,7 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) {
3535
{
3636
name: "Should set all values correctly",
3737
pool: &asocontainerservicev1hub.ManagedClustersAgentPool{
38-
Spec: asocontainerservicev1hub.ManagedClusters_AgentPool_Spec{
38+
Spec: asocontainerservicev1hub.ManagedClustersAgentPool_Spec{
3939
AzureName: "agentpool1",
4040
VmSize: ptr.To("Standard_D2s_v3"),
4141
OsType: ptr.To(string(asocontainerservicev1.OSType_Linux)),

‎azure/converters/subnets_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestGetSubnetAddresses(t *testing.T) {
3838
{
3939
name: "subnet with single address prefix",
4040
subnet: asonetworkv1.VirtualNetworksSubnet{
41-
Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
41+
Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
4242
AddressPrefix: ptr.To("test-address-prefix"),
4343
},
4444
},
@@ -47,7 +47,7 @@ func TestGetSubnetAddresses(t *testing.T) {
4747
{
4848
name: "subnet with multiple address prefixes",
4949
subnet: asonetworkv1.VirtualNetworksSubnet{
50-
Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
50+
Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
5151
AddressPrefixes: []string{
5252
"test-address-prefix-1",
5353
"test-address-prefix-2",

‎azure/services/agentpools/agentpools.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package agentpools
1919
import (
2020
"context"
2121

22-
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
22+
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
2323
"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
2424
"k8s.io/utils/ptr"
2525
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

‎azure/services/agentpools/agentpools_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
4949
scope.EXPECT().RemoveCAPIMachinePoolAnnotation(clusterv1.ReplicasManagedByAnnotation)
5050

5151
managedCluster := &asocontainerservicev1.ManagedClustersAgentPool{
52-
Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
52+
Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
5353
EnableAutoScaling: ptr.To(false),
5454
},
5555
}
@@ -67,7 +67,7 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
6767
scope.EXPECT().SetCAPIMachinePoolReplicas(ptr.To(1234))
6868

6969
managedCluster := &asocontainerservicev1.ManagedClustersAgentPool{
70-
Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
70+
Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
7171
EnableAutoScaling: ptr.To(true),
7272
Count: ptr.To(1234),
7373
},
@@ -86,7 +86,7 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
8686
scope.EXPECT().SetCAPIMachinePoolReplicas(ptr.To(1234))
8787

8888
agentPool := &asocontainerservicev1preview.ManagedClustersAgentPool{
89-
Status: asocontainerservicev1preview.ManagedClusters_AgentPool_STATUS{
89+
Status: asocontainerservicev1preview.ManagedClustersAgentPool_STATUS{
9090
EnableAutoScaling: ptr.To(true),
9191
Count: ptr.To(1234),
9292
},

‎azure/services/agentpools/spec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"context"
2121

2222
asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
23-
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
2423
asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
24+
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
2525
"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
2626
"k8s.io/apimachinery/pkg/api/resource"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎azure/services/agentpools/spec_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestParameters(t *testing.T) {
7575
EnableEncryptionAtHost: ptr.To(false),
7676
}
7777
expected := &asocontainerservicev1.ManagedClustersAgentPool{
78-
Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
78+
Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
7979
AzureName: "azure name",
8080
Owner: &genruntime.KnownResourceReference{
8181
Name: "cluster",
@@ -171,7 +171,7 @@ func TestParameters(t *testing.T) {
171171
EnableEncryptionAtHost: ptr.To(false),
172172
}
173173
expected := &asocontainerservicev1preview.ManagedClustersAgentPool{
174-
Spec: asocontainerservicev1preview.ManagedClusters_AgentPool_Spec{
174+
Spec: asocontainerservicev1preview.ManagedClustersAgentPool_Spec{
175175
AzureName: "azure name",
176176
Owner: &genruntime.KnownResourceReference{
177177
Name: "cluster",
@@ -233,14 +233,14 @@ func TestParameters(t *testing.T) {
233233
Version: ptr.To("1.26.6"),
234234
}
235235
existing := &asocontainerservicev1.ManagedClustersAgentPool{
236-
Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
236+
Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
237237
AzureName: "set by the user",
238238
PowerState: &asocontainerservicev1.PowerState{
239239
Code: ptr.To(asocontainerservicev1.PowerState_Code("set by the user")),
240240
},
241241
OrchestratorVersion: ptr.To("1.27.2"),
242242
},
243-
Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
243+
Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
244244
Count: ptr.To(1212),
245245
},
246246
}
@@ -268,14 +268,14 @@ func TestParameters(t *testing.T) {
268268
Preview: true,
269269
}
270270
existing := &asocontainerservicev1preview.ManagedClustersAgentPool{
271-
Spec: asocontainerservicev1preview.ManagedClusters_AgentPool_Spec{
271+
Spec: asocontainerservicev1preview.ManagedClustersAgentPool_Spec{
272272
AzureName: "set by the user",
273273
PowerState: &asocontainerservicev1preview.PowerState{
274274
Code: ptr.To(asocontainerservicev1preview.PowerState_Code("set by the user")),
275275
},
276276
OrchestratorVersion: ptr.To("1.27.2"),
277277
},
278-
Status: asocontainerservicev1preview.ManagedClusters_AgentPool_STATUS{
278+
Status: asocontainerservicev1preview.ManagedClustersAgentPool_STATUS{
279279
Count: ptr.To(1212),
280280
},
281281
}

‎azure/services/bastionhosts/spec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ func (s *AzureBastionSpec) Parameters(_ context.Context, existingBastionHost *as
7878
bastionHost.Spec.IpConfigurations = []asonetworkv1.BastionHostIPConfiguration{
7979
{
8080
Name: ptr.To(bastionHostIPConfigName),
81-
Subnet: &asonetworkv1.BastionHostSubResource{
81+
Subnet: &asonetworkv1.SubResource{
8282
Reference: &genruntime.ResourceReference{
8383
ARMID: s.SubnetID,
8484
},
8585
},
86-
PublicIPAddress: &asonetworkv1.BastionHostSubResource{
86+
PublicIPAddress: &asonetworkv1.SubResource{
8787
Reference: &genruntime.ResourceReference{
8888
ARMID: s.PublicIPID,
8989
},

‎azure/services/bastionhosts/spec_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ var (
4646
IpConfigurations: []asonetworkv1.BastionHostIPConfiguration{
4747
{
4848
Name: ptr.To(fmt.Sprintf("%s-%s", fakeAzureBastionSpec1.Name, "bastionIP")),
49-
Subnet: &asonetworkv1.BastionHostSubResource{
49+
Subnet: &asonetworkv1.SubResource{
5050
Reference: &genruntime.ResourceReference{
5151
ARMID: fakeAzureBastionSpec1.SubnetID,
5252
},
5353
},
54-
PublicIPAddress: &asonetworkv1.BastionHostSubResource{
54+
PublicIPAddress: &asonetworkv1.SubResource{
5555
Reference: &genruntime.ResourceReference{
5656
ARMID: fakeAzureBastionSpec1.PublicIPID,
5757
},

‎azure/services/fleetsmembers/spec_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
var (
3333
fakeAzureFleetsMember = asocontainerservicev1.FleetsMember{
34-
Spec: asocontainerservicev1.Fleets_Member_Spec{
34+
Spec: asocontainerservicev1.FleetsMember_Spec{
3535
AzureName: fakeAzureFleetsMemberSpec.Name,
3636
Owner: &genruntime.KnownResourceReference{
3737
ARMID: azure.FleetID(fakeAzureFleetsMemberSpec.SubscriptionID, fakeAzureFleetsMemberSpec.ManagerResourceGroup, fakeAzureFleetsMemberSpec.ManagerName),
@@ -51,7 +51,7 @@ var (
5151
ManagerName: "fake-manager-name",
5252
ManagerResourceGroup: "fake-manager-resource-group",
5353
}
54-
fakeFleetsMemberStatus = asocontainerservicev1.Fleets_Member_STATUS{
54+
fakeFleetsMemberStatus = asocontainerservicev1.FleetsMember_STATUS{
5555
Name: ptr.To(fakeAzureFleetsMemberSpec.Name),
5656
ProvisioningState: ptr.To(asocontainerservicev1.FleetMemberProvisioningState_STATUS_Succeeded),
5757
}

0 commit comments

Comments
 (0)