Skip to content

Commit 855433a

Browse files
cpanatocpanato
authored
update CAPI to 1.4.8 (#541)
Signed-off-by: cpanato <ctadeu@gmail.com>
1 parent 0e7fd31 commit 855433a

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
437437
./hack/install-cert-manager.sh
438438

439439
# Deploy CAPI
440-
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 -
440+
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 -
441441

442442
# Deploy CAPDO
443443
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capdo

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ settings = {
1616
"deploy_cert_manager": True,
1717
"preload_images_for_kind": True,
1818
"kind_cluster_name": "capdo",
19-
"capi_version": "v1.4.5",
19+
"capi_version": "v1.4.8",
2020
"cert_manager_version": "v1.10.1",
2121
"kubernetes_version": "v1.25.5",
2222
}

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ require (
1717
k8s.io/client-go v0.26.7
1818
k8s.io/klog/v2 v2.90.1
1919
k8s.io/utils v0.0.0-20230209194617-a36077c30491
20-
sigs.k8s.io/cluster-api v1.4.5
21-
sigs.k8s.io/cluster-api/test v1.4.5
20+
sigs.k8s.io/cluster-api v1.4.8
21+
sigs.k8s.io/cluster-api/test v1.4.8
2222
sigs.k8s.io/controller-runtime v0.14.5
2323
)
2424

@@ -37,7 +37,7 @@ require (
3737
github.com/blang/semver/v4 v4.0.0 // indirect
3838
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3939
github.com/coredns/caddy v1.1.0 // indirect
40-
github.com/coredns/corefile-migration v1.0.20 // indirect
40+
github.com/coredns/corefile-migration v1.0.21 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/docker/distribution v2.8.2+incompatible // indirect
4343
github.com/docker/docker v24.0.5+incompatible // indirect
@@ -102,7 +102,7 @@ require (
102102
github.com/valyala/fastjson v1.6.4 // indirect
103103
golang.org/x/crypto v0.14.0 // indirect
104104
golang.org/x/mod v0.12.0 // indirect
105-
golang.org/x/net v0.16.0 // indirect
105+
golang.org/x/net v0.17.0 // indirect
106106
golang.org/x/sys v0.13.0 // indirect
107107
golang.org/x/term v0.13.0 // indirect
108108
golang.org/x/text v0.13.0 // indirect
@@ -128,4 +128,4 @@ require (
128128
sigs.k8s.io/yaml v1.3.0 // indirect
129129
)
130130

131-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.5
131+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.8

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
9090
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
9191
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
9292
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
93-
github.com/coredns/corefile-migration v1.0.20 h1:MdOkT6F3ehju/n9tgxlGct8XAajOX2vN+wG7To4BWSI=
94-
github.com/coredns/corefile-migration v1.0.20/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
93+
github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE=
94+
github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
9595
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
9696
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
9797
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -583,8 +583,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
583583
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
584584
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
585585
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
586-
golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
587-
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
586+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
587+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
588588
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
589589
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
590590
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -906,10 +906,10 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt
906906
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
907907
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
908908
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
909-
sigs.k8s.io/cluster-api v1.4.5 h1:Xwi9cuL3FOR1gB6FhhKi7EEadY4m3CdJAesyx9/kxUo=
910-
sigs.k8s.io/cluster-api v1.4.5/go.mod h1:HSiT5mE5uuxctGBiQcRJrZ6/iH+CCVmTvOryxSBcBG8=
911-
sigs.k8s.io/cluster-api/test v1.4.5 h1:0ZuQre03UaxRXgiK3wQjtJNZGebw1xFaPvKFDOi3KaM=
912-
sigs.k8s.io/cluster-api/test v1.4.5/go.mod h1:OMWLTfmTeFqMtprBE1zCDDpYect1M5jcEYYTSY7AgSA=
909+
sigs.k8s.io/cluster-api v1.4.8 h1:9gcmmohqHBw85cuvLxOV7UjuNV9qTVE/Y2s+DHlHgOI=
910+
sigs.k8s.io/cluster-api v1.4.8/go.mod h1:RUzEEOvhL3XL5EEOfv30psPysiKA/qumY4ZU3sjZWo0=
911+
sigs.k8s.io/cluster-api/test v1.4.8 h1:QLMOIbrtRoG15I6wCdx5cUjb4BLm5F2h3+x8k3vdiSY=
912+
sigs.k8s.io/cluster-api/test v1.4.8/go.mod h1:SWwaDU4qKQHWBMU703UWVfWiPqnDyhf+J5MBVHSjQiw=
913913
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
914914
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
915915
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎test/e2e/config/digitalocean-ci.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ providers:
77
- name: cluster-api
88
type: CoreProvider
99
versions:
10-
- name: v1.4.5
11-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml
10+
- name: v1.4.8
11+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/core-components.yaml
1212
type: "url"
1313
files:
1414
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
2020
- name: kubeadm
2121
type: BootstrapProvider
2222
versions:
23-
- name: v1.4.5
24-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml
23+
- name: v1.4.8
24+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/bootstrap-components.yaml
2525
type: "url"
2626
files:
2727
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
3333
- name: kubeadm
3434
type: ControlPlaneProvider
3535
versions:
36-
- name: v1.4.5
37-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml
36+
- name: v1.4.8
37+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/control-plane-components.yaml
3838
type: "url"
3939
files:
4040
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ providers:
77
- name: cluster-api
88
type: CoreProvider
99
versions:
10-
- name: v1.4.5
11-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml
10+
- name: v1.4.8
11+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/core-components.yaml
1212
type: "url"
1313
files:
1414
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -20,8 +20,8 @@ providers:
2020
- name: kubeadm
2121
type: BootstrapProvider
2222
versions:
23-
- name: v1.4.5
24-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml
23+
- name: v1.4.8
24+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/bootstrap-components.yaml
2525
type: "url"
2626
files:
2727
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"
@@ -33,8 +33,8 @@ providers:
3333
- name: kubeadm
3434
type: ControlPlaneProvider
3535
versions:
36-
- name: v1.4.5
37-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml
36+
- name: v1.4.8
37+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.8/control-plane-components.yaml
3838
type: "url"
3939
files:
4040
- sourcePath: "${PWD}/test/e2e/data/metadata/cluster-api/metadata.yaml"

0 commit comments

Comments
 (0)