Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 50 additions & 20 deletions config/aso/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: bastionhosts.network.azure.com
spec:
conversion:
Expand All @@ -22,6 +22,9 @@ spec:
- v1
group: network.azure.com
names:
categories:
- azure
- network
kind: BastionHost
listKind: BastionHostList
plural: bastionhosts
Expand Down Expand Up @@ -1700,10 +1703,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: extensions.kubernetesconfiguration.azure.com
spec:
conversion:
Expand All @@ -1719,6 +1722,9 @@ spec:
- v1
group: kubernetesconfiguration.azure.com
names:
categories:
- azure
- kubernetesconfiguration
kind: Extension
listKind: ExtensionList
plural: extensions
Expand Down Expand Up @@ -4173,10 +4179,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: fleetsmembers.containerservice.azure.com
spec:
conversion:
Expand All @@ -4192,6 +4198,9 @@ spec:
- v1
group: containerservice.azure.com
names:
categories:
- azure
- containerservice
kind: FleetsMember
listKind: FleetsMemberList
plural: fleetsmembers
Expand Down Expand Up @@ -4735,10 +4744,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: managedclusters.containerservice.azure.com
spec:
conversion:
Expand All @@ -4754,6 +4763,9 @@ spec:
- v1
group: containerservice.azure.com
names:
categories:
- azure
- containerservice
kind: ManagedCluster
listKind: ManagedClusterList
plural: managedclusters
Expand Down Expand Up @@ -45718,10 +45730,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: managedclustersagentpools.containerservice.azure.com
spec:
conversion:
Expand All @@ -45737,6 +45749,9 @@ spec:
- v1
group: containerservice.azure.com
names:
categories:
- azure
- containerservice
kind: ManagedClustersAgentPool
listKind: ManagedClustersAgentPoolList
plural: managedclustersagentpools
Expand Down Expand Up @@ -58615,10 +58630,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: natgateways.network.azure.com
spec:
conversion:
Expand All @@ -58634,6 +58649,9 @@ spec:
- v1
group: network.azure.com
names:
categories:
- azure
- network
kind: NatGateway
listKind: NatGatewayList
plural: natgateways
Expand Down Expand Up @@ -60089,10 +60107,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: privateendpoints.network.azure.com
spec:
conversion:
Expand All @@ -60108,6 +60126,9 @@ spec:
- v1
group: network.azure.com
names:
categories:
- azure
- network
kind: PrivateEndpoint
listKind: PrivateEndpointList
plural: privateendpoints
Expand Down Expand Up @@ -62769,10 +62790,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: resourcegroups.resources.azure.com
spec:
conversion:
Expand All @@ -62788,6 +62809,9 @@ spec:
- v1
group: resources.azure.com
names:
categories:
- azure
- resources
kind: ResourceGroup
listKind: ResourceGroupList
plural: resourcegroups
Expand Down Expand Up @@ -63238,10 +63262,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: virtualnetworks.network.azure.com
spec:
conversion:
Expand All @@ -63257,6 +63281,9 @@ spec:
- v1
group: network.azure.com
names:
categories:
- azure
- network
kind: VirtualNetwork
listKind: VirtualNetworkList
plural: virtualnetworks
Expand Down Expand Up @@ -65084,10 +65111,10 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: azureserviceoperator-system/azureserviceoperator-serving-cert
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
labels:
app.kubernetes.io/name: azure-service-operator
app.kubernetes.io/version: v2.13.0
app.kubernetes.io/version: v2.15.0
name: virtualnetworkssubnets.network.azure.com
spec:
conversion:
Expand All @@ -65103,6 +65130,9 @@ spec:
- v1
group: network.azure.com
names:
categories:
- azure
- network
kind: VirtualNetworksSubnet
listKind: VirtualNetworksSubnetList
plural: virtualnetworkssubnets
Expand Down
2 changes: 1 addition & 1 deletion config/aso/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Component
namespace: capz-system
resources:
# The ASO version here is managed by `make generate-aso-crds`
- https://github.com/Azure/azure-service-operator/releases/download/v2.13.0/azureserviceoperator_v2.13.0.yaml
- https://github.com/Azure/azure-service-operator/releases/download/v2.15.0/azureserviceoperator_v2.15.0.yaml
- crds.yaml
- settings.yaml
patches:
Expand Down
39 changes: 19 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcehealth/armresourcehealth v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
github.com/Azure/azure-sdk-for-go/sdk/tracing/azotel v0.4.0
github.com/Azure/azure-service-operator/v2 v2.13.0
github.com/Azure/azure-service-operator/v2 v2.15.0
github.com/Azure/go-autorest/autorest v0.11.30
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13
github.com/Azure/msi-dataplane v0.4.3
Expand All @@ -35,7 +35,7 @@ require (
github.com/onsi/gomega v1.38.2
github.com/pkg/errors v0.9.1
github.com/pkg/sftp v1.13.9
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_golang v1.23.0
github.com/spf13/pflag v1.0.9
go.opentelemetry.io/otel v1.37.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
Expand All @@ -49,32 +49,32 @@ require (
golang.org/x/mod v0.27.0
golang.org/x/text v0.28.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
k8s.io/api v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/client-go v0.33.4
k8s.io/cluster-bootstrap v0.32.3
k8s.io/component-base v0.32.3
k8s.io/component-base v0.33.4
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.32.3
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
sigs.k8s.io/cloud-provider-azure v1.32.3
sigs.k8s.io/cluster-api v1.10.4
sigs.k8s.io/cluster-api/test v1.10.4
sigs.k8s.io/controller-runtime v0.20.4
sigs.k8s.io/controller-runtime v0.21.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @mboersma in case the current version of ASO doesn't build against this newer controller-runtime in #5661, the changes in this PR will need to be incorporated there. If CI is green without bumping ASO there though, I don't think we need to try to do that.

sigs.k8s.io/kind v0.29.0
)

require (
al.essio.dev/pkg/shellescape v1.5.1 // indirect
cel.dev/expr v0.23.0 // indirect
cel.dev/expr v0.24.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.4.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.5.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6 v6.2.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
Expand All @@ -95,7 +95,6 @@ require (
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
github.com/adrg/xdg v0.5.3 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
Expand All @@ -117,7 +116,7 @@ require (
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonpointer v0.21.2 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
Expand All @@ -126,22 +125,21 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.22.1 // indirect
github.com/google/cel-go v0.26.0 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-github/v53 v53.2.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jellydator/ttlcache/v3 v3.3.0 // indirect
github.com/jellydator/ttlcache/v3 v3.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/fs v0.1.0 // indirect
Expand Down Expand Up @@ -175,7 +173,7 @@ require (
github.com/rivo/uniseg v0.4.2 // indirect
github.com/rotisserie/eris v0.5.4 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
github.com/samber/lo v1.49.1 // indirect
github.com/samber/lo v1.51.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.12.0 // indirect
Expand All @@ -194,13 +192,14 @@ require (
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.36.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
Expand All @@ -209,8 +208,8 @@ require (
google.golang.org/protobuf v1.36.7 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apiextensions-apiserver v0.32.3 // indirect
k8s.io/apiserver v0.32.3 // indirect
k8s.io/apiextensions-apiserver v0.33.4 // indirect
k8s.io/apiserver v0.33.4 // indirect
k8s.io/cli-runtime v0.32.3 // indirect
k8s.io/cloud-provider v0.32.2 // indirect
k8s.io/component-helpers v0.32.3 // indirect
Expand All @@ -223,5 +222,5 @@ require (
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading