Skip to content

Commit efe9c73

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3915 from mboersma/capi-one-four-six-for-release-1.9
[release-1.9] Update CAPI to v1.4.6
2 parents 3a8aff2 + 6553405 commit efe9c73

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎Makefile‎

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

287287
# Deploy CAPI
288-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
288+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
289289

290290
# Deploy CAPZ
291291
$(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.4.5",
23-
"cert_manager_version": "v1.12.2",
22+
"capi_version": "v1.4.6",
23+
"cert_manager_version": "v1.12.3",
2424
"kubernetes_version": "v1.24.6",
2525
"aks_kubernetes_version": "v1.24.6",
2626
"flatcar_version": "3374.2.1",

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ require (
4343
k8s.io/kubectl v0.26.1
4444
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
4545
sigs.k8s.io/cloud-provider-azure v1.26.7
46-
sigs.k8s.io/cluster-api v1.4.5
47-
sigs.k8s.io/cluster-api/test v1.4.5
46+
sigs.k8s.io/cluster-api v1.4.6
47+
sigs.k8s.io/cluster-api/test v1.4.6
4848
sigs.k8s.io/controller-runtime v0.14.5
4949
sigs.k8s.io/kind v0.20.0
5050
)
@@ -75,7 +75,7 @@ require (
7575
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7676
github.com/chai2010/gettext-go v1.0.2 // indirect
7777
github.com/coredns/caddy v1.1.0 // indirect
78-
github.com/coredns/corefile-migration v1.0.20 // indirect
78+
github.com/coredns/corefile-migration v1.0.21 // indirect
7979
github.com/davecgh/go-spew v1.1.1 // indirect
8080
github.com/dimchansky/utfbom v1.1.1 // indirect
8181
github.com/docker/distribution v2.8.2+incompatible // indirect
@@ -163,7 +163,7 @@ require (
163163
go.opentelemetry.io/otel/metric v1.16.0 // indirect
164164
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
165165
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
166-
golang.org/x/net v0.12.0 // indirect
166+
golang.org/x/net v0.13.0 // indirect
167167
golang.org/x/oauth2 v0.10.0 // indirect
168168
golang.org/x/sys v0.10.0 // indirect
169169
golang.org/x/term v0.10.0 // indirect
@@ -194,4 +194,4 @@ require (
194194
sigs.k8s.io/yaml v1.3.0 // indirect
195195
)
196196

197-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.5
197+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.6

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
134134
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
135135
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
136136
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
137-
github.com/coredns/corefile-migration v1.0.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI=
138-
github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
137+
github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE=
138+
github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
139139
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
140140
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
141141
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -711,8 +711,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
711711
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
712712
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
713713
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
714-
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
715-
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
714+
golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
715+
golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
716716
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
717717
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
718718
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1053,10 +1053,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10531053
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10541054
sigs.k8s.io/cloud-provider-azure v1.26.7 h1:LSVRPyxeTQZPOF7z42zNZGzL1S1N5tg28RBZVy7gea4=
10551055
sigs.k8s.io/cloud-provider-azure v1.26.7/go.mod h1:UIwr0Bk4wQb77wNL9cdT4zZw6DP2AtOQ9EKRt9c5g7Q=
1056-
sigs.k8s.io/cluster-api v1.4.5 h1:Xwi9cuL3FOR1gB6FhhKi7EEadY4m3CdJAesyx9/kxUo=
1057-
sigs.k8s.io/cluster-api v1.4.5/go.mod h1:HSiT5mE5uuxctGBiQcRJrZ6/iH+CCVmTvOryxSBcBG8=
1058-
sigs.k8s.io/cluster-api/test v1.4.5 h1:0ZuQre03UaxRXgiK3wQjtJNZGebw1xFaPvKFDOi3KaM=
1059-
sigs.k8s.io/cluster-api/test v1.4.5/go.mod h1:OMWLTfmTeFqMtprBE1zCDDpYect1M5jcEYYTSY7AgSA=
1056+
sigs.k8s.io/cluster-api v1.4.6 h1:ZOAtQsPW7zh2iY7RdvvUozPR7OYRDCPSFEBS0979Vys=
1057+
sigs.k8s.io/cluster-api v1.4.6/go.mod h1:B+QIe/B4Yp+NqMSd6f36Oh+7pIgalsClAX976rIn9J0=
1058+
sigs.k8s.io/cluster-api/test v1.4.6 h1:a+sVWioQfir1Bw7fQJbd162RFjgiWX2078Yh3fEm4qw=
1059+
sigs.k8s.io/cluster-api/test v1.4.6/go.mod h1:SBKZ9SR50acvjQyE/d+tVB88jky7mbVDZ4UURdEkNjk=
10601060
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
10611061
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
10621062
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎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.12.1/cert-manager.yaml
57+
"${KUBECTL}" apply -f https://github.com/jetstack/cert-manager/releases/download/v1.12.3/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.4.5
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.6
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.5
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.6
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.5
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.6
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.4.5
27-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml
26+
- name: v1.4.6
27+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/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.4.5
50-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml
49+
- name: v1.4.6
50+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/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.4.5
72-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml
71+
- name: v1.4.6
72+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/control-plane-components.yaml
7373
type: url
7474
contract: v1beta1
7575
files:

0 commit comments

Comments
 (0)