Skip to content

Commit eec0da9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5428 from bryan-cox/update-aso-dep
Update ASO to v2.11.0
2 parents 202e091 + f5db230 commit eec0da9

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
}

‎azure/services/managedclusters/managedclusters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222

2323
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
24-
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
24+
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
2525
"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
2626
"github.com/pkg/errors"
2727
corev1 "k8s.io/api/core/v1"

‎azure/services/managedclusters/spec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"sort"
2525

2626
asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
27-
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
2827
asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
28+
asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901/storage"
2929
"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
3030
"github.com/pkg/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎azure/services/natgateways/spec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (s *NatGatewaySpec) Parameters(_ context.Context, existingNatGateway *asone
6666
natGateway.Spec.Sku = &asonetworkv1.NatGatewaySku{
6767
Name: ptr.To(asonetworkv1.NatGatewaySku_Name_Standard),
6868
}
69-
natGateway.Spec.PublicIpAddresses = []asonetworkv1.ApplicationGatewaySubResource{
69+
natGateway.Spec.PublicIpAddresses = []asonetworkv1.SubResource{
7070
{
7171
Reference: &genruntime.ResourceReference{
7272
ARMID: azure.PublicIPID(s.SubscriptionID, s.ResourceGroup, s.NatGatewayIP.Name),

‎azure/services/natgateways/spec_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var (
6262
Owner: &genruntime.KnownResourceReference{
6363
Name: "my-rg",
6464
},
65-
PublicIpAddresses: []asonetworkv1.ApplicationGatewaySubResource{
65+
PublicIpAddresses: []asonetworkv1.SubResource{
6666
{
6767
Reference: &genruntime.ResourceReference{
6868
ARMID: "/subscriptions/123/resourceGroups/my-rg/providers/Microsoft.Network/publicIPAddresses/my-natgateway-ip",
@@ -83,7 +83,7 @@ var (
8383
Location: locationPtr,
8484
Name: ptr.To("my-natgateway"),
8585
ProvisioningState: ptr.To(asonetworkv1.ApplicationGatewayProvisioningState_STATUS_Succeeded),
86-
PublicIpAddresses: []asonetworkv1.ApplicationGatewaySubResource_STATUS{
86+
PublicIpAddresses: []asonetworkv1.SubResource_STATUS{
8787
{
8888
Id: ptr.To("/subscriptions/123/resourceGroups/my-rg/providers/Microsoft.Network/publicIPAddresses/my-natgateway-ip"),
8989
},

‎azure/services/subnets/spec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *SubnetSpec) Parameters(_ context.Context, existing *asonetworkv1.Virtua
6262
subnet = &asonetworkv1.VirtualNetworksSubnet{}
6363
}
6464

65-
subnet.Spec = asonetworkv1.VirtualNetworks_Subnet_Spec{
65+
subnet.Spec = asonetworkv1.VirtualNetworksSubnet_Spec{
6666
AzureName: s.Name,
6767
Owner: &genruntime.KnownResourceReference{
6868
Name: azure.GetNormalizedKubernetesName(s.VNetName),

‎azure/services/subnets/spec_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestParameters(t *testing.T) {
5858
},
5959
existing: nil,
6060
expected: &asonetworkv1.VirtualNetworksSubnet{
61-
Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
61+
Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
6262
AzureName: "subnet",
6363
Owner: &genruntime.KnownResourceReference{
6464
Name: "vnet",
@@ -110,12 +110,12 @@ func TestParameters(t *testing.T) {
110110
},
111111
},
112112
existing: &asonetworkv1.VirtualNetworksSubnet{
113-
Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
113+
Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
114114
Id: ptr.To("status is preserved"),
115115
},
116116
},
117117
expected: &asonetworkv1.VirtualNetworksSubnet{
118-
Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
118+
Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
119119
AzureName: "subnet",
120120
Owner: &genruntime.KnownResourceReference{
121121
Name: "vnet",
@@ -144,7 +144,7 @@ func TestParameters(t *testing.T) {
144144
},
145145
},
146146
},
147-
Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
147+
Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
148148
Id: ptr.To("status is preserved"),
149149
},
150150
},

‎azure/services/subnets/subnets_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
4545
scope.EXPECT().UpdateSubnetID("subnet", "id")
4646
scope.EXPECT().UpdateSubnetCIDRs("subnet", []string{"cidr"})
4747
subnet := &asonetworkv1.VirtualNetworksSubnet{
48-
Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
48+
Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
4949
AzureName: "subnet",
5050
},
51-
Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
51+
Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
5252
Id: ptr.To("id"),
5353
AddressPrefixes: []string{"cidr"},
5454
},

‎azure/services/virtualnetworks/virtualnetworks_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
7575
labels.OwnerNameLabel: existing.Name,
7676
},
7777
},
78-
Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
78+
Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
7979
AzureName: "azure-name",
8080
},
81-
Status: asonetworkv1.VirtualNetworks_Subnet_STATUS{
81+
Status: asonetworkv1.VirtualNetworksSubnet_STATUS{
8282
AddressPrefixes: []string{"address prefixes"},
8383
},
8484
},
8585
&asonetworkv1.VirtualNetworksSubnet{
8686
ObjectMeta: metav1.ObjectMeta{
8787
Name: "other subnet",
8888
},
89-
Spec: asonetworkv1.VirtualNetworks_Subnet_Spec{
89+
Spec: asonetworkv1.VirtualNetworksSubnet_Spec{
9090
Owner: &genruntime.KnownResourceReference{
9191
Name: "not this vnet",
9292
},

‎controllers/azureasomanagedmachinepool_controller_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,13 @@ func TestAzureASOManagedMachinePoolReconcile(t *testing.T) {
314314
Name: "ap",
315315
Namespace: cluster.Namespace,
316316
},
317-
Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
317+
Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
318318
AzureName: "pool1",
319319
Owner: &genruntime.KnownResourceReference{
320320
Name: asoManagedCluster.Name,
321321
},
322322
},
323-
Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
323+
Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
324324
Count: ptr.To(3),
325325
},
326326
}
@@ -456,14 +456,14 @@ func TestAzureASOManagedMachinePoolReconcile(t *testing.T) {
456456
Name: "ap",
457457
Namespace: cluster.Namespace,
458458
},
459-
Spec: asocontainerservicev1.ManagedClusters_AgentPool_Spec{
459+
Spec: asocontainerservicev1.ManagedClustersAgentPool_Spec{
460460
AzureName: "pool1",
461461
Owner: &genruntime.KnownResourceReference{
462462
Name: asoManagedCluster.Name,
463463
},
464464
EnableAutoScaling: ptr.To(true),
465465
},
466-
Status: asocontainerservicev1.ManagedClusters_AgentPool_STATUS{
466+
Status: asocontainerservicev1.ManagedClustersAgentPool_STATUS{
467467
Count: ptr.To(3),
468468
},
469469
}

0 commit comments

Comments
 (0)