Skip to content

Commit dcb0c5a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4348 from mboersma/cherry-pick-4344-to-release-1.11
[release-1.11] Bump CAPI to v1.5.4
2 parents cb8a95c + 4c6b477 commit dcb0c5a

File tree

5 files changed

+87
-89
lines changed

5 files changed

+87
-89
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
305305
./hack/create-custom-cloud-provider-config.sh
306306

307307
# Deploy CAPI
308-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
308+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
309309

310310
# Deploy CAPZ
311311
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME)

‎Tiltfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capz",
22-
"capi_version": "v1.5.3",
23-
"cert_manager_version": "v1.13.1",
22+
"capi_version": "v1.5.4",
23+
"cert_manager_version": "v1.13.2",
2424
"kubernetes_version": "v1.28.0",
2525
"aks_kubernetes_version": "v1.26.3",
2626
"flatcar_version": "3374.2.1",

‎go.mod‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
github.com/Azure/go-autorest/tracing v0.6.0
2222
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
2323
github.com/blang/semver v3.5.1+incompatible
24-
github.com/go-logr/logr v1.2.4
25-
github.com/google/go-cmp v0.5.9
24+
github.com/go-logr/logr v1.3.0
25+
github.com/google/go-cmp v0.6.0
2626
github.com/google/uuid v1.3.1
2727
github.com/hashicorp/go-retryablehttp v0.7.4
2828
github.com/hashicorp/golang-lru v1.0.2
@@ -33,28 +33,28 @@ require (
3333
github.com/pkg/sftp v1.13.6
3434
github.com/prometheus/client_golang v1.16.0
3535
github.com/spf13/pflag v1.0.5
36-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
37-
go.opentelemetry.io/otel v1.19.0
38-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
36+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0
37+
go.opentelemetry.io/otel v1.20.0
38+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0
3939
go.opentelemetry.io/otel/exporters/prometheus v0.40.0
40-
go.opentelemetry.io/otel/sdk v1.19.0
40+
go.opentelemetry.io/otel/sdk v1.20.0
4141
go.opentelemetry.io/otel/sdk/metric v0.40.0
42-
go.opentelemetry.io/otel/trace v1.19.0
42+
go.opentelemetry.io/otel/trace v1.20.0
4343
go.uber.org/mock v0.2.0
4444
golang.org/x/crypto v0.14.0
4545
golang.org/x/mod v0.12.0
4646
golang.org/x/text v0.13.0
47-
k8s.io/api v0.27.2
48-
k8s.io/apimachinery v0.27.2
49-
k8s.io/client-go v0.27.2
50-
k8s.io/component-base v0.27.2
47+
k8s.io/api v0.27.7
48+
k8s.io/apimachinery v0.27.7
49+
k8s.io/client-go v0.27.7
50+
k8s.io/component-base v0.27.7
5151
k8s.io/klog/v2 v2.90.1
5252
k8s.io/kubectl v0.27.2
5353
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
5454
sigs.k8s.io/cloud-provider-azure v1.27.7
55-
sigs.k8s.io/cluster-api v1.5.3
56-
sigs.k8s.io/cluster-api/test v1.5.3
57-
sigs.k8s.io/controller-runtime v0.15.1
55+
sigs.k8s.io/cluster-api v1.5.4
56+
sigs.k8s.io/cluster-api/test v1.5.4
57+
sigs.k8s.io/controller-runtime v0.15.3
5858
sigs.k8s.io/kind v0.20.0
5959
)
6060

@@ -90,7 +90,7 @@ require (
9090
github.com/davecgh/go-spew v1.1.1 // indirect
9191
github.com/dimchansky/utfbom v1.1.1 // indirect
9292
github.com/docker/distribution v2.8.2+incompatible // indirect
93-
github.com/docker/docker v24.0.5+incompatible // indirect
93+
github.com/docker/docker v24.0.7+incompatible // indirect
9494
github.com/docker/go-connections v0.4.0 // indirect
9595
github.com/docker/go-units v0.5.0 // indirect
9696
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -99,7 +99,7 @@ require (
9999
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
100100
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
101101
github.com/fatih/camelcase v1.0.0 // indirect
102-
github.com/felixge/httpsnoop v1.0.3 // indirect
102+
github.com/felixge/httpsnoop v1.0.4 // indirect
103103
github.com/fsnotify/fsnotify v1.6.0 // indirect
104104
github.com/go-errors/errors v1.4.2 // indirect
105105
github.com/go-logr/stdr v1.2.2 // indirect
@@ -116,7 +116,7 @@ require (
116116
github.com/golang/mock v1.6.0 // indirect
117117
github.com/golang/protobuf v1.5.3 // indirect
118118
github.com/google/btree v1.0.1 // indirect
119-
github.com/google/cel-go v0.12.6 // indirect
119+
github.com/google/cel-go v0.12.7 // indirect
120120
github.com/google/gnostic v0.6.9 // indirect
121121
github.com/google/go-github/v48 v48.2.0 // indirect
122122
github.com/google/go-querystring v1.1.0 // indirect
@@ -171,30 +171,29 @@ require (
171171
github.com/subosito/gotenv v1.4.2 // indirect
172172
github.com/valyala/fastjson v1.6.4 // indirect
173173
github.com/xlab/treeprint v1.1.0 // indirect
174-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
175-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
174+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
175+
go.opentelemetry.io/otel/metric v1.20.0 // indirect
176176
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
177177
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
178178
golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd // indirect
179179
golang.org/x/net v0.17.0 // indirect
180-
golang.org/x/oauth2 v0.10.0 // indirect
181-
golang.org/x/sys v0.13.0 // indirect
180+
golang.org/x/oauth2 v0.11.0 // indirect
181+
golang.org/x/sys v0.14.0 // indirect
182182
golang.org/x/term v0.13.0 // indirect
183183
golang.org/x/time v0.3.0 // indirect
184184
golang.org/x/tools v0.12.0 // indirect
185185
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
186186
google.golang.org/appengine v1.6.7 // indirect
187-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
188-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
189-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
190-
google.golang.org/grpc v1.58.3 // indirect
187+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
188+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
189+
google.golang.org/grpc v1.59.0 // indirect
191190
google.golang.org/protobuf v1.31.0 // indirect
192191
gopkg.in/inf.v0 v0.9.1 // indirect
193192
gopkg.in/ini.v1 v1.67.0 // indirect
194193
gopkg.in/yaml.v2 v2.4.0 // indirect
195194
gopkg.in/yaml.v3 v3.0.1 // indirect
196-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
197-
k8s.io/apiserver v0.27.2 // indirect
195+
k8s.io/apiextensions-apiserver v0.27.7 // indirect
196+
k8s.io/apiserver v0.27.7 // indirect
198197
k8s.io/cli-runtime v0.27.2 // indirect
199198
k8s.io/cloud-provider v0.27.1 // indirect
200199
k8s.io/cluster-bootstrap v0.27.2 // indirect
@@ -206,4 +205,4 @@ require (
206205
sigs.k8s.io/yaml v1.3.0 // indirect
207206
)
208207

209-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.3
208+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.4

0 commit comments

Comments
 (0)