Skip to content

Commit 67233e5

Browse files
nojnhuhnojnhuh
committed
bump ASO to v2.8.0
1 parent 8138d4e commit 67233e5

File tree

7 files changed

+25788
-4241
lines changed

7 files changed

+25788
-4241
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ CRD_ROOT ?= $(MANIFEST_ROOT)/crd/bases
165165
WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook
166166
RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
167167
ASO_CRDS_PATH := $(MANIFEST_ROOT)/aso/crds.yaml
168-
ASO_VERSION := v2.6.0
168+
ASO_VERSION := v2.8.0
169169
ASO_CRDS := resourcegroups.resources.azure.com natgateways.network.azure.com managedclusters.containerservice.azure.com managedclustersagentpools.containerservice.azure.com bastionhosts.network.azure.com virtualnetworks.network.azure.com virtualnetworkssubnets.network.azure.com privateendpoints.network.azure.com fleetsmembers.containerservice.azure.com extensions.kubernetesconfiguration.azure.com
170170

171171
# Allow overriding the imagePullPolicy

‎config/aso/crds.yaml

Lines changed: 25651 additions & 4108 deletions
Large diffs are not rendered by default.

‎config/aso/kustomization.yaml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
22
kind: Component
33
namespace: capz-system
44
resources:
5-
- https://github.com/Azure/azure-service-operator/releases/download/v2.6.0/azureserviceoperator_v2.6.0.yaml
5+
- https://github.com/Azure/azure-service-operator/releases/download/v2.8.0/azureserviceoperator_v2.8.0.yaml
66
- crds.yaml
77
- settings.yaml
88

@@ -36,27 +36,6 @@ patches:
3636
name: azureserviceoperator-controller-manager
3737
version: v1
3838

39-
# This implements https://github.com/Azure/azure-service-operator/pull/4011
40-
# for versions of ASO which don't include that fix.
41-
- patch: |-
42-
apiVersion: apps/v1
43-
kind: Deployment
44-
metadata:
45-
name: azureserviceoperator-controller-manager
46-
namespace: azureserviceoperator-system
47-
spec:
48-
template:
49-
spec:
50-
containers:
51-
- name: manager
52-
env:
53-
- name: AZURE_USER_AGENT_SUFFIX
54-
valueFrom:
55-
secretKeyRef:
56-
key: AZURE_USER_AGENT_SUFFIX
57-
name: aso-controller-settings
58-
optional: true
59-
6039
replacements:
6140
- source:
6241
fieldPath: metadata.namespace

‎config/aso/settings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stringData:
77
AZURE_AUTHORITY_HOST: ${AZURE_AUTHORITY_HOST:=""}
88
AZURE_RESOURCE_MANAGER_ENDPOINT: ${AZURE_RESOURCE_MANAGER_ENDPOINT:=""}
99
AZURE_RESOURCE_MANAGER_AUDIENCE: ${AZURE_RESOURCE_MANAGER_AUDIENCE:=""}
10-
AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:="1h"}
10+
AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:=""}
1111
AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/main
1212
# Per-resource Secrets will be created based on a Cluster's AzureClusterIdentity.
1313
AZURE_SUBSCRIPTION_ID: ""

‎go.mod

Lines changed: 67 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module sigs.k8s.io/cluster-api-provider-azure
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.5
46

57
require (
68
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
@@ -15,7 +17,7 @@ require (
1517
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.2.0
1618
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcehealth/armresourcehealth v1.3.0
1719
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
18-
github.com/Azure/azure-service-operator/v2 v2.6.0
20+
github.com/Azure/azure-service-operator/v2 v2.8.0
1921
github.com/Azure/go-autorest/autorest v0.11.29
2022
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13
2123
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
@@ -29,32 +31,32 @@ require (
2931
github.com/onsi/gomega v1.33.1
3032
github.com/pkg/errors v0.9.1
3133
github.com/pkg/sftp v1.13.6
32-
github.com/prometheus/client_golang v1.18.0
34+
github.com/prometheus/client_golang v1.19.1
3335
github.com/spf13/pflag v1.0.5
34-
go.opentelemetry.io/otel v1.24.0
35-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
36+
go.opentelemetry.io/otel v1.27.0
37+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
3638
go.opentelemetry.io/otel/exporters/prometheus v0.46.0
37-
go.opentelemetry.io/otel/sdk v1.24.0
39+
go.opentelemetry.io/otel/sdk v1.27.0
3840
go.opentelemetry.io/otel/sdk/metric v1.24.0
39-
go.opentelemetry.io/otel/trace v1.24.0
41+
go.opentelemetry.io/otel/trace v1.27.0
4042
go.uber.org/mock v0.4.0
4143
golang.org/x/crypto v0.25.0
42-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
44+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
4345
golang.org/x/mod v0.19.0
4446
golang.org/x/text v0.16.0
4547
gopkg.in/yaml.v3 v3.0.1
46-
k8s.io/api v0.29.3
47-
k8s.io/apimachinery v0.29.3
48-
k8s.io/client-go v0.29.3
48+
k8s.io/api v0.30.2
49+
k8s.io/apimachinery v0.30.2
50+
k8s.io/client-go v0.30.2
4951
k8s.io/cluster-bootstrap v0.29.3
50-
k8s.io/component-base v0.29.3
51-
k8s.io/klog/v2 v2.120.1
52+
k8s.io/component-base v0.30.2
53+
k8s.io/klog/v2 v2.130.1
5254
k8s.io/kubectl v0.29.3
53-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
55+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
5456
sigs.k8s.io/cloud-provider-azure v1.29.3
5557
sigs.k8s.io/cluster-api v1.7.3
5658
sigs.k8s.io/cluster-api/test v1.7.3
57-
sigs.k8s.io/controller-runtime v0.17.3
59+
sigs.k8s.io/controller-runtime v0.18.4
5860
sigs.k8s.io/kind v0.23.0
5961
)
6062

@@ -63,11 +65,12 @@ require (
6365
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
6466
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 // indirect
6567
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
68+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6669
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6770
github.com/gorilla/websocket v1.5.0 // indirect
6871
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
6972
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
70-
k8s.io/apiserver v0.29.3 // indirect
73+
k8s.io/apiserver v0.30.2 // indirect
7174
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.2 // indirect
7275
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.1 // indirect
7376
)
@@ -96,12 +99,11 @@ require (
9699
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
97100
github.com/adrg/xdg v0.4.0 // indirect
98101
github.com/alessio/shellescape v1.4.1 // indirect
99-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
100102
github.com/benbjohnson/clock v1.3.5 // indirect
101103
github.com/beorn7/perks v1.0.1 // indirect
102104
github.com/blang/semver/v4 v4.0.0 // indirect
103-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
104-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
105+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
106+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
105107
github.com/cloudflare/circl v1.3.7 // indirect
106108
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
107109
github.com/dimchansky/utfbom v1.1.1 // indirect
@@ -110,25 +112,25 @@ require (
110112
github.com/docker/go-connections v0.5.0 // indirect
111113
github.com/docker/go-units v0.5.0 // indirect
112114
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
113-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
115+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
114116
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
115117
github.com/evanphx/json-patch/v5 v5.9.0
116118
github.com/fatih/camelcase v1.0.0 // indirect
117119
github.com/felixge/httpsnoop v1.0.4 // indirect
118120
github.com/fsnotify/fsnotify v1.7.0 // indirect
119121
github.com/go-errors/errors v1.4.2 // indirect
120122
github.com/go-logr/stdr v1.2.2 // indirect
121-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
122-
github.com/go-openapi/jsonreference v0.20.4 // indirect
123-
github.com/go-openapi/swag v0.22.8 // indirect
123+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
124+
github.com/go-openapi/jsonreference v0.21.0 // indirect
125+
github.com/go-openapi/swag v0.23.0 // indirect
124126
github.com/gobuffalo/flect v1.0.2 // indirect
125127
github.com/gogo/protobuf v1.3.2 // indirect
126128
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
127129
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
128130
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
129131
github.com/golang/protobuf v1.5.4 // indirect
130132
github.com/google/btree v1.0.1 // indirect
131-
github.com/google/cel-go v0.17.7 // indirect
133+
github.com/google/cel-go v0.20.1 // indirect
132134
github.com/google/gnostic-models v0.6.8 // indirect
133135
github.com/google/go-github/v53 v53.2.0 // indirect
134136
github.com/google/go-querystring v1.1.0 // indirect
@@ -137,7 +139,7 @@ require (
137139
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
138140
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
139141
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
140-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
142+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
141143
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
142144
github.com/hashicorp/hcl v1.0.0 // indirect
143145
github.com/huandu/xstrings v1.4.0 // indirect
@@ -166,49 +168,48 @@ require (
166168
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
167169
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
168170
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
169-
github.com/prometheus/client_model v0.6.0 // indirect
170-
github.com/prometheus/common v0.46.0 // indirect
171-
github.com/prometheus/procfs v0.12.0 // indirect
171+
github.com/prometheus/client_model v0.6.1 // indirect
172+
github.com/prometheus/common v0.54.0 // indirect
173+
github.com/prometheus/procfs v0.15.1 // indirect
172174
github.com/sagikazarmark/locafero v0.4.0 // indirect
173175
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
174176
github.com/shopspring/decimal v1.3.1 // indirect
175177
github.com/sourcegraph/conc v0.3.0 // indirect
176178
github.com/spf13/afero v1.11.0 // indirect
177179
github.com/spf13/cast v1.6.0 // indirect
178-
github.com/spf13/cobra v1.8.0 // indirect
180+
github.com/spf13/cobra v1.8.1 // indirect
179181
github.com/spf13/viper v1.18.2 // indirect
180-
github.com/stoewer/go-strcase v1.2.0 // indirect
182+
github.com/stoewer/go-strcase v1.3.0 // indirect
181183
github.com/subosito/gotenv v1.6.0 // indirect
182184
github.com/valyala/fastjson v1.6.4 // indirect
183185
github.com/xlab/treeprint v1.2.0 // indirect
184-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
185-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
186-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
187-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
186+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
187+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
188+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
189+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
188190
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
189191
go.uber.org/multierr v1.11.0 // indirect
190192
golang.org/x/net v0.26.0 // indirect
191-
golang.org/x/oauth2 v0.18.0 // indirect
193+
golang.org/x/oauth2 v0.21.0 // indirect
192194
golang.org/x/sync v0.7.0 // indirect
193195
golang.org/x/sys v0.22.0 // indirect
194196
golang.org/x/term v0.22.0 // indirect
195197
golang.org/x/time v0.5.0 // indirect
196-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
198+
golang.org/x/tools v0.22.0 // indirect
197199
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
198-
google.golang.org/appengine v1.6.8 // indirect
199-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
200-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
201-
google.golang.org/grpc v1.61.1 // indirect
202-
google.golang.org/protobuf v1.33.0 // indirect
200+
google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 // indirect
201+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240610135401-a8a62080eff3 // indirect
202+
google.golang.org/grpc v1.64.0 // indirect
203+
google.golang.org/protobuf v1.34.2 // indirect
203204
gopkg.in/inf.v0 v0.9.1 // indirect
204205
gopkg.in/ini.v1 v1.67.0 // indirect
205206
gopkg.in/yaml.v2 v2.4.0 // indirect
206-
k8s.io/apiextensions-apiserver v0.29.3 // indirect
207+
k8s.io/apiextensions-apiserver v0.30.2 // indirect
207208
k8s.io/cli-runtime v0.29.3 // indirect
208209
k8s.io/cloud-provider v0.29.3 // indirect
209210
k8s.io/component-helpers v0.29.3 // indirect
210-
k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15 // indirect
211-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
211+
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
212+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
212213
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
213214
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
214215
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
@@ -220,3 +221,25 @@ replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.3
220221

221222
// kube-openapi should match the version imported by CAPI.
222223
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
224+
225+
// Play nice with ASO 2.8. Most of these can probably be removed with CAPI 1.8.
226+
replace (
227+
github.com/google/cel-go => github.com/google/cel-go v0.17.8
228+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
229+
github.com/prometheus/common => github.com/prometheus/common v0.46.0
230+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0
231+
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.24.0
232+
go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
233+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
234+
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.24.0
235+
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.24.0
236+
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.24.0
237+
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v1.1.0
238+
k8s.io/api => k8s.io/api v0.29.3
239+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3
240+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.3
241+
k8s.io/apiserver => k8s.io/apiserver v0.29.3
242+
k8s.io/client-go => k8s.io/client-go v0.29.3
243+
k8s.io/component-base => k8s.io/component-base v0.29.3
244+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.17.3
245+
)

0 commit comments

Comments
 (0)