Skip to content

Commit f310144

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3222 from k8s-infra-cherrypick-robot/cherry-pick-3218-to-release-1.7
[release-1.7] bump CAPI to v1.3.5
2 parents dec6cdc + 639e884 commit f310144

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

‎Makefile‎

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

281281
# Deploy CAPI
282-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
282+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
283283

284284
# Deploy CAPZ
285285
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capz",
22-
"capi_version": "v1.3.3",
22+
"capi_version": "v1.3.5",
2323
"cert_manager_version": "v1.11.0",
2424
"kubernetes_version": "v1.24.6",
2525
"aks_kubernetes_version": "v1.24.6",

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
go.opentelemetry.io/otel/trace v1.4.0
3838
golang.org/x/crypto v0.3.0
3939
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
40-
golang.org/x/text v0.5.0
40+
golang.org/x/text v0.7.0
4141
helm.sh/helm/v3 v3.9.0
4242
k8s.io/api v0.25.4
4343
k8s.io/apimachinery v0.25.4
@@ -47,8 +47,8 @@ require (
4747
k8s.io/kubectl v0.25.0
4848
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
4949
sigs.k8s.io/cloud-provider-azure v1.25.5
50-
sigs.k8s.io/cluster-api v1.3.3
51-
sigs.k8s.io/cluster-api/test v1.3.3
50+
sigs.k8s.io/cluster-api v1.3.5
51+
sigs.k8s.io/cluster-api/test v1.3.5
5252
sigs.k8s.io/controller-runtime v0.13.1
5353
sigs.k8s.io/kind v0.17.0
5454
)
@@ -80,7 +80,7 @@ require (
8080
github.com/chai2010/gettext-go v1.0.2 // indirect
8181
github.com/containerd/containerd v1.6.3 // indirect
8282
github.com/coredns/caddy v1.1.0 // indirect
83-
github.com/coredns/corefile-migration v1.0.18 // indirect
83+
github.com/coredns/corefile-migration v1.0.20 // indirect
8484
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
8585
github.com/davecgh/go-spew v1.1.1 // indirect
8686
github.com/dimchansky/utfbom v1.1.1 // indirect
@@ -189,11 +189,11 @@ require (
189189
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
190190
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
191191
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
192-
golang.org/x/net v0.4.0 // indirect
192+
golang.org/x/net v0.7.0 // indirect
193193
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
194194
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
195-
golang.org/x/sys v0.3.0 // indirect
196-
golang.org/x/term v0.3.0 // indirect
195+
golang.org/x/sys v0.5.0 // indirect
196+
golang.org/x/term v0.5.0 // indirect
197197
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
198198
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
199199
google.golang.org/appengine v1.6.7 // indirect
@@ -219,4 +219,4 @@ require (
219219
sigs.k8s.io/yaml v1.3.0 // indirect
220220
)
221221

222-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.3
222+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.5

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ github.com/containerd/containerd v1.6.3 h1:JfgUEIAH07xDWk6kqz0P3ArZt+KJ9YeihSC9u
165165
github.com/containerd/containerd v1.6.3/go.mod h1:gCVGrYRYFm2E8GmuUIbj/NGD7DLZQLzSJQazjVKDOig=
166166
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
167167
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
168-
github.com/coredns/corefile-migration v1.0.18 h1:zs5PJm/VGZVje1ESRj6ZqyUuVsVfagExkbLU2QKV5mI=
169-
github.com/coredns/corefile-migration v1.0.18/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
168+
github.com/coredns/corefile-migration v1.0.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI=
169+
github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
170170
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
171171
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
172172
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -909,8 +909,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
909909
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
910910
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
911911
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
912-
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
913-
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
912+
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
913+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
914914
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
915915
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
916916
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1008,13 +1008,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
10081008
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10091009
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10101010
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1011-
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
1012-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1011+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
1012+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10131013
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
10141014
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
10151015
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
1016-
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
1017-
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
1016+
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
1017+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
10181018
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10191019
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10201020
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1025,8 +1025,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10251025
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10261026
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
10271027
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1028-
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
1029-
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1028+
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
1029+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
10301030
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10311031
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10321032
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1292,10 +1292,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12921292
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12931293
sigs.k8s.io/cloud-provider-azure v1.25.5 h1:YRq/wStyUtxgtMrAuRg+4FS0Gylt6MRatA8z5uag0/s=
12941294
sigs.k8s.io/cloud-provider-azure v1.25.5/go.mod h1:estRnm6TL3dWLQTVoej4+0ygXyhIZmpszBXipHrfuZ0=
1295-
sigs.k8s.io/cluster-api v1.3.3 h1:sHRAbuev6+bz3OAySmdmT62md/D/UUIy0EYwvP38H/4=
1296-
sigs.k8s.io/cluster-api v1.3.3/go.mod h1:nnXmR51rHshpMEXmB4LZIwdiXWKXV6yaooB1KzrL0Qs=
1297-
sigs.k8s.io/cluster-api/test v1.3.3 h1:AzX6zWneNOv3umK9PnhON5kjt2MJaw0jvFl39ReWL28=
1298-
sigs.k8s.io/cluster-api/test v1.3.3/go.mod h1:HKkh1O4lALo51GsXVIJ1rQNyLRE+CbEVcA+f/1gU5Rw=
1295+
sigs.k8s.io/cluster-api v1.3.5 h1:Chg56Piv5ip0AFRN83H1I8uIn6qsdk+mr9hdq5Cxkf0=
1296+
sigs.k8s.io/cluster-api v1.3.5/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc=
1297+
sigs.k8s.io/cluster-api/test v1.3.5 h1:+uY+oMwIK5NOH1S/VPCl5gl9TuUBRRdr/qiji4r1B7I=
1298+
sigs.k8s.io/cluster-api/test v1.3.5/go.mod h1:oRc0fAaj3ZPMuV0GTRQbseZ6IrNyDUB8ReKil5lkAtw=
12991299
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
13001300
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
13011301
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎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.3.3
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.3.5
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.3.3
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.3.5
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.3.3
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.3.5
1111
loadBehavior: tryLoad
1212

1313
providers:
@@ -23,8 +23,8 @@ providers:
2323
new: --metrics-addr=:8080
2424
files:
2525
- sourcePath: "../data/shared/v1alpha4/metadata.yaml"
26-
- name: v1.3.3
27-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/core-components.yaml
26+
- name: v1.3.5
27+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/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/v1alpha4/metadata.yaml"
49-
- name: v1.3.3
50-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/bootstrap-components.yaml
49+
- name: v1.3.5
50+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/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/v1alpha4/metadata.yaml"
71-
- name: v1.3.3
72-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.3/control-plane-components.yaml
71+
- name: v1.3.5
72+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/control-plane-components.yaml
7373
type: url
7474
contract: v1beta1
7575
files:

0 commit comments

Comments
 (0)