Skip to content

Commit f177cf0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4183 from k8s-infra-cherrypick-robot/cherry-pick-4170-to-release-1.11
[release-1.11] Update CAPI to v1.5.3
2 parents aef2f77 + 3bbaea4 commit f177cf0

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
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.2/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.3/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.2",
23-
"cert_manager_version": "v1.13.0",
22+
"capi_version": "v1.5.3",
23+
"cert_manager_version": "v1.13.1",
2424
"kubernetes_version": "v1.28.0",
2525
"aks_kubernetes_version": "v1.26.3",
2626
"flatcar_version": "3374.2.1",

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ 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.43.0
37-
go.opentelemetry.io/otel v1.17.0
38-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0
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
3939
go.opentelemetry.io/otel/exporters/prometheus v0.40.0
40-
go.opentelemetry.io/otel/sdk v1.17.0
40+
go.opentelemetry.io/otel/sdk v1.19.0
4141
go.opentelemetry.io/otel/sdk/metric v0.40.0
42-
go.opentelemetry.io/otel/trace v1.17.0
42+
go.opentelemetry.io/otel/trace v1.19.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
@@ -52,8 +52,8 @@ require (
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.2
56-
sigs.k8s.io/cluster-api/test v1.5.2
55+
sigs.k8s.io/cluster-api v1.5.3
56+
sigs.k8s.io/cluster-api/test v1.5.3
5757
sigs.k8s.io/controller-runtime v0.15.1
5858
sigs.k8s.io/kind v0.20.0
5959
)
@@ -171,8 +171,8 @@ 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.17.0 // indirect
175-
go.opentelemetry.io/otel/metric v1.17.0 // indirect
174+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
175+
go.opentelemetry.io/otel/metric v1.19.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
@@ -187,7 +187,7 @@ require (
187187
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
188188
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
189189
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
190-
google.golang.org/grpc v1.57.1 // indirect
190+
google.golang.org/grpc v1.58.3 // indirect
191191
google.golang.org/protobuf v1.31.0 // indirect
192192
gopkg.in/inf.v0 v0.9.1 // indirect
193193
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -206,4 +206,4 @@ require (
206206
sigs.k8s.io/yaml v1.3.0 // indirect
207207
)
208208

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

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -627,24 +627,24 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
627627
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
628628
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
629629
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
630-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 h1:HKORGpiOY0R0nAPtKx/ub8/7XoHhRooP8yNRkuPfelI=
631-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0/go.mod h1:e+y1M74SYXo/FcIx3UATwth2+5dDkM8dBi7eXg1tbw8=
632-
go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM=
633-
go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0=
634-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY=
635-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ=
636-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU=
637-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE=
630+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI=
631+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48=
632+
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
633+
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
634+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
635+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
636+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
637+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
638638
go.opentelemetry.io/otel/exporters/prometheus v0.40.0 h1:9h6lCssr1j5aYVvWT6oc+ERB6R034zmsHjBRLyxrAR8=
639639
go.opentelemetry.io/otel/exporters/prometheus v0.40.0/go.mod h1:5USWZ0ovyQB5CIM3IO3bGRSoDPMXiT3t+15gu8Zo9HQ=
640-
go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc=
641-
go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o=
642-
go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE=
643-
go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
640+
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
641+
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
642+
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
643+
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
644644
go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU=
645645
go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs=
646-
go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ=
647-
go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
646+
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
647+
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
648648
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
649649
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
650650
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
@@ -1015,8 +1015,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
10151015
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
10161016
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
10171017
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
1018-
google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg=
1019-
google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
1018+
google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
1019+
google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
10201020
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
10211021
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
10221022
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1099,10 +1099,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10991099
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
11001100
sigs.k8s.io/cloud-provider-azure v1.27.7 h1:X6DdOA1aUlnBfSffTdq1zGWph7L62VY6ZS1ErwR5bVY=
11011101
sigs.k8s.io/cloud-provider-azure v1.27.7/go.mod h1:ytwtCpVGJFvIc+n9q6CB14QD+AiiuXnsqz3DkWG7bBI=
1102-
sigs.k8s.io/cluster-api v1.5.2 h1:pCsyEHwTBb7n+U5Z2OA5STxdJ1EuSpJv8FLBx4lii3s=
1103-
sigs.k8s.io/cluster-api v1.5.2/go.mod h1:EGJUNpFWi7dF426tO8MG/jE+w7T0UO5KyMnOwQ5riUY=
1104-
sigs.k8s.io/cluster-api/test v1.5.2 h1:Hlorgn4ebGdSxP4IZAT7eMweAowh4n0/vdhc4HAPNF8=
1105-
sigs.k8s.io/cluster-api/test v1.5.2/go.mod h1:mFlsY1y0lApBgQyXbmVprdzCK+9MQNp1C38K+aZdn5A=
1102+
sigs.k8s.io/cluster-api v1.5.3 h1:TtxneDCps14sZ9bNr515ivBRMj9OwUE6mRUr6l7fSBA=
1103+
sigs.k8s.io/cluster-api v1.5.3/go.mod h1:0fMUk93Wf7AkQHIWLbDoKsiUHaMxnpqfLMlVmx8DX7Q=
1104+
sigs.k8s.io/cluster-api/test v1.5.3 h1:csAqV0aCJ6rsOfr2k5FaZ6ENdTZgJS44mxPvrHtMIlc=
1105+
sigs.k8s.io/cluster-api/test v1.5.3/go.mod h1:D+jHrP3ghuN/k/wfOGnE91riDLSzMmyaYjVUkRAnl80=
11061106
sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
11071107
sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
11081108
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎hack/install-cert-manager.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ source "${REPO_ROOT}/hack/common-vars.sh"
5454
make --directory="${REPO_ROOT}" "${KUBECTL##*/}"
5555

5656
## Install cert manager and wait for availability
57-
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.0/cert-manager.yaml
57+
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.13.1/cert-manager.yaml
5858
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager
5959
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-cainjector
6060
"${KUBECTL}" wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

‎test/e2e/config/azure-dev.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ managementClusterName: capz-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.2
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.3
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.2
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.3
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.2
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.3
1111
loadBehavior: tryLoad
1212

1313
providers:
@@ -23,8 +23,8 @@ providers:
2323
new: --metrics-addr=:8080
2424
files:
2525
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
26-
- name: v1.5.2
27-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/core-components.yaml
26+
- name: v1.5.3
27+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/core-components.yaml
2828
type: url
2929
contract: v1beta1
3030
files:
@@ -46,8 +46,8 @@ providers:
4646
new: --metrics-addr=:8080
4747
files:
4848
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
49-
- name: v1.5.2
50-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/bootstrap-components.yaml
49+
- name: v1.5.3
50+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/bootstrap-components.yaml
5151
type: url
5252
contract: v1beta1
5353
files:
@@ -68,8 +68,8 @@ providers:
6868
new: --metrics-addr=:8080
6969
files:
7070
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
71-
- name: v1.5.2
72-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/control-plane-components.yaml
71+
- name: v1.5.3
72+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/control-plane-components.yaml
7373
type: url
7474
contract: v1beta1
7575
files:

0 commit comments

Comments
 (0)