Skip to content

Bump ASO to v2.15.1 #5997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nojnhuh wants to merge 1 commit into
base: main
Choose a base branch
from
+98 −64
Open

Bump ASO to v2.15.1 #5997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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.1
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.1
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.1
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.1
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.1
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.1
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.1
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.1
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.1
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.1
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
20 changes: 1 addition & 19 deletions config/aso/kustomization.yaml
View file
Open in desktop
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.1/azureserviceoperator_v2.15.1.yaml
- crds.yaml
- settings.yaml
patches:
Expand All @@ -30,24 +30,6 @@ patches:
- op: replace # Users can specify additional ASO CRDs. CRDs should be appended with ';'
path: /spec/template/spec/containers/0/args/6
value: --crd-pattern=${ADDITIONAL_ASO_CRDS:= }

# ASO will provide a startupProbe starting in v2.14.0.
# These patches should be removed when the upstream probe is set.
- op: test
path: /spec/template/spec/containers/0/startupProbe
value: null
- op: add
path: /spec/template/spec/containers/0/startupProbe
value:
httpGet:
path: /healthz
port: 8081
periodSeconds: 10
failureThreshold: 12
- op: remove
path: /spec/template/spec/containers/0/livenessProbe/initialDelaySeconds
- op: remove
path: /spec/template/spec/containers/0/readinessProbe/initialDelaySeconds
target:
group: apps
kind: Deployment
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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.1
github.com/Azure/msi-dataplane v0.4.3
github.com/asaskevich/govalidator/v11 v11.0.2-0.20250122183457-e11347878e23
github.com/blang/semver v3.5.1+incompatible
Expand Down Expand Up @@ -111,7 +111,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 @@ -120,7 +120,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.23.2 // 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
Expand All @@ -132,7 +132,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // 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 @@ -197,7 +197,7 @@ require (
google.golang.org/protobuf v1.36.8 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/apiextensions-apiserver v0.33.4 // indirect
k8s.io/apiserver v0.33.4 // indirect
k8s.io/cli-runtime v0.33.6 // indirect
k8s.io/cloud-provider v0.33.4 // indirect
Expand Down
Loading