Skip to content

Commit ef47267

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4171 from mboersma/bump-capi-release-1.10
[release-1.10] Update CAPI to v1.4.8
2 parents 928ddf4 + 64cd848 commit ef47267

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed

‎Makefile‎

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

294294
# Deploy CAPI
295-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
295+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
296296

297297
# Deploy CAPZ
298298
$(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.7",
23-
"cert_manager_version": "v1.13.0",
22+
"capi_version": "v1.4.8",
23+
"cert_manager_version": "v1.13.1",
2424
"kubernetes_version": "v1.27.2",
2525
"aks_kubernetes_version": "v1.26.3",
2626
"flatcar_version": "3374.2.1",

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ require (
3333
go.opentelemetry.io/otel/sdk v1.16.0
3434
go.opentelemetry.io/otel/sdk/metric v0.39.0
3535
go.opentelemetry.io/otel/trace v1.16.0
36-
golang.org/x/crypto v0.11.0
36+
golang.org/x/crypto v0.14.0
3737
golang.org/x/mod v0.12.0
38-
golang.org/x/text v0.12.0
38+
golang.org/x/text v0.13.0
3939
k8s.io/api v0.26.2
4040
k8s.io/apimachinery v0.26.2
4141
k8s.io/client-go v0.26.2
@@ -44,8 +44,8 @@ require (
4444
k8s.io/kubectl v0.26.1
4545
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
4646
sigs.k8s.io/cloud-provider-azure v1.26.7
47-
sigs.k8s.io/cluster-api v1.4.7
48-
sigs.k8s.io/cluster-api/test v1.4.7
47+
sigs.k8s.io/cluster-api v1.4.8
48+
sigs.k8s.io/cluster-api/test v1.4.8
4949
sigs.k8s.io/controller-runtime v0.14.5
5050
sigs.k8s.io/kind v0.20.0
5151
)
@@ -166,10 +166,10 @@ require (
166166
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
167167
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
168168
golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd // indirect
169-
golang.org/x/net v0.13.0 // indirect
169+
golang.org/x/net v0.17.0 // indirect
170170
golang.org/x/oauth2 v0.10.0 // indirect
171-
golang.org/x/sys v0.10.0 // indirect
172-
golang.org/x/term v0.10.0 // indirect
171+
golang.org/x/sys v0.13.0 // indirect
172+
golang.org/x/term v0.13.0 // indirect
173173
golang.org/x/time v0.3.0 // indirect
174174
golang.org/x/tools v0.9.3 // indirect
175175
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
@@ -197,4 +197,4 @@ require (
197197
sigs.k8s.io/yaml v1.3.0 // indirect
198198
)
199199

200-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.7
200+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.8

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,8 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0
650650
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
651651
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
652652
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
653-
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
654-
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
653+
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
654+
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
655655
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
656656
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
657657
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -732,8 +732,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
732732
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
733733
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
734734
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
735-
golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
736-
golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
735+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
736+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
737737
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
738738
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
739739
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -811,14 +811,14 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
811811
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
812812
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
813813
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
814-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
815-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
814+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
815+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
816816
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
817817
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
818818
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
819819
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
820-
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
821-
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
820+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
821+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
822822
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
823823
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
824824
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -830,8 +830,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
830830
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
831831
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
832832
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
833-
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
834-
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
833+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
834+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
835835
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
836836
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
837837
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1074,10 +1074,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10741074
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10751075
sigs.k8s.io/cloud-provider-azure v1.26.7 h1:LSVRPyxeTQZPOF7z42zNZGzL1S1N5tg28RBZVy7gea4=
10761076
sigs.k8s.io/cloud-provider-azure v1.26.7/go.mod h1:UIwr0Bk4wQb77wNL9cdT4zZw6DP2AtOQ9EKRt9c5g7Q=
1077-
sigs.k8s.io/cluster-api v1.4.7 h1:24UFXLDy6eiL37wquWSofKJAmFP691PLKBIA9VSUX2A=
1078-
sigs.k8s.io/cluster-api v1.4.7/go.mod h1:B+QIe/B4Yp+NqMSd6f36Oh+7pIgalsClAX976rIn9J0=
1079-
sigs.k8s.io/cluster-api/test v1.4.7 h1:/RsOGIa17S0Fox3DpgbCvKxMEHLNGjuo6/wF0k6lsqM=
1080-
sigs.k8s.io/cluster-api/test v1.4.7/go.mod h1:SBKZ9SR50acvjQyE/d+tVB88jky7mbVDZ4UURdEkNjk=
1077+
sigs.k8s.io/cluster-api v1.4.8 h1:9gcmmohqHBw85cuvLxOV7UjuNV9qTVE/Y2s+DHlHgOI=
1078+
sigs.k8s.io/cluster-api v1.4.8/go.mod h1:RUzEEOvhL3XL5EEOfv30psPysiKA/qumY4ZU3sjZWo0=
1079+
sigs.k8s.io/cluster-api/test v1.4.8 h1:QLMOIbrtRoG15I6wCdx5cUjb4BLm5F2h3+x8k3vdiSY=
1080+
sigs.k8s.io/cluster-api/test v1.4.8/go.mod h1:SWwaDU4qKQHWBMU703UWVfWiPqnDyhf+J5MBVHSjQiw=
10811081
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
10821082
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
10831083
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.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.4.7
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.8
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.7
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.8
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.7
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.8
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.7
27-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/core-components.yaml
26+
- name: v1.4.8
27+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/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.7
50-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/bootstrap-components.yaml
49+
- name: v1.4.8
50+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/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.7
72-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.7/control-plane-components.yaml
71+
- name: v1.4.8
72+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/control-plane-components.yaml
7373
type: url
7474
contract: v1beta1
7575
files:

0 commit comments

Comments
 (0)