Skip to content

Commit 6bfff95

Browse files
hrakhrak
committed
chore(deps): Update to CAPI v1.5.8 and others
1 parent fc531ce commit 6bfff95

File tree

8 files changed

+156
-133
lines changed

8 files changed

+156
-133
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ delete-kind-cluster:
301301
kind delete cluster --name $(KIND_CLUSTER_NAME)
302302

303303
cluster-api: ## Clone cluster-api repository for tilt use.
304-
git clone --branch v1.5.7 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
304+
git clone --branch v1.5.8 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
305305

306306
cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
307307
cp ./hack/tilt-settings.json cluster-api

‎go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ module sigs.k8s.io/cluster-api-provider-cloudstack
33
go 1.21
44

55
require (
6-
github.com/apache/cloudstack-go/v2 v2.16.0
7-
github.com/go-logr/logr v1.4.1
6+
github.com/apache/cloudstack-go/v2 v2.16.1
7+
github.com/go-logr/logr v1.4.2
88
github.com/golang/mock v1.6.0
99
github.com/hashicorp/go-multierror v1.1.1
1010
github.com/jellydator/ttlcache/v3 v3.2.0
11-
github.com/onsi/ginkgo/v2 v2.11.0
12-
github.com/onsi/gomega v1.27.8
11+
github.com/onsi/ginkgo/v2 v2.19.0
12+
github.com/onsi/gomega v1.33.1
1313
github.com/pkg/errors v0.9.1
1414
github.com/prometheus/client_golang v1.19.1
1515
github.com/smallfish/simpleyaml v0.1.0
1616
github.com/spf13/pflag v1.0.5
17-
golang.org/x/text v0.14.0
17+
golang.org/x/text v0.16.0
1818
gopkg.in/yaml.v3 v3.0.1
1919
k8s.io/api v0.27.14
2020
k8s.io/apimachinery v0.27.14
2121
k8s.io/client-go v0.27.14
2222
k8s.io/component-base v0.27.14
2323
k8s.io/klog/v2 v2.90.1
2424
k8s.io/utils v0.0.0-20230505201702-9f6742963106
25-
sigs.k8s.io/cluster-api v1.5.7
25+
sigs.k8s.io/cluster-api v1.5.8
2626
sigs.k8s.io/controller-runtime v0.15.3
2727
)
2828

@@ -34,22 +34,23 @@ require (
3434
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3535
github.com/coredns/caddy v1.1.1 // indirect
3636
github.com/davecgh/go-spew v1.1.1 // indirect
37-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
37+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3838
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3939
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4040
github.com/fsnotify/fsnotify v1.6.0 // indirect
4141
github.com/go-openapi/jsonpointer v0.19.6 // indirect
42-
github.com/go-openapi/jsonreference v0.20.1 // indirect
42+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4343
github.com/go-openapi/swag v0.22.3 // indirect
44-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
44+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4545
github.com/gobuffalo/flect v1.0.2 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
4747
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4848
github.com/golang/protobuf v1.5.4 // indirect
4949
github.com/google/gnostic v0.6.9 // indirect
50+
github.com/google/gnostic-models v0.6.8 // indirect
5051
github.com/google/go-cmp v0.6.0 // indirect
5152
github.com/google/gofuzz v1.2.0 // indirect
52-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
53+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
5354
github.com/google/uuid v1.3.1 // indirect
5455
github.com/hashicorp/errwrap v1.0.0 // indirect
5556
github.com/imdario/mergo v0.3.13 // indirect
@@ -64,23 +65,22 @@ require (
6465
github.com/prometheus/common v0.48.0 // indirect
6566
github.com/prometheus/procfs v0.12.0 // indirect
6667
github.com/spf13/cobra v1.7.0 // indirect
67-
go.uber.org/atomic v1.10.0 // indirect
68-
golang.org/x/net v0.23.0 // indirect
68+
golang.org/x/net v0.25.0 // indirect
6969
golang.org/x/oauth2 v0.16.0 // indirect
70-
golang.org/x/sync v0.5.0 // indirect
71-
golang.org/x/sys v0.18.0 // indirect
72-
golang.org/x/term v0.18.0 // indirect
70+
golang.org/x/sync v0.7.0 // indirect
71+
golang.org/x/sys v0.20.0 // indirect
72+
golang.org/x/term v0.20.0 // indirect
7373
golang.org/x/time v0.3.0 // indirect
74-
golang.org/x/tools v0.16.1 // indirect
74+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
7575
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
7676
google.golang.org/appengine v1.6.7 // indirect
7777
google.golang.org/protobuf v1.33.0 // indirect
7878
gopkg.in/inf.v0 v0.9.1 // indirect
7979
gopkg.in/yaml.v2 v2.4.0 // indirect
8080
k8s.io/apiextensions-apiserver v0.27.14 // indirect
8181
k8s.io/cluster-bootstrap v0.27.14 // indirect
82-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
82+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
8383
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
84-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
84+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8585
sigs.k8s.io/yaml v1.3.0 // indirect
8686
)

‎go.sum

Lines changed: 71 additions & 48 deletions
Large diffs are not rendered by default.

‎hack/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ require (
2020
)
2121

2222
replace (
23-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.7
24-
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.5.7
23+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.8
24+
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.5.8
2525
)

‎hack/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
2525
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
2626
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
2727
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
28-
sigs.k8s.io/cluster-api v1.5.7 h1:/qobSDBc0wLIlr2PMgHysmwFCAhg80t5MznSz+x5pOE=
29-
sigs.k8s.io/cluster-api v1.5.7/go.mod h1:I2swI7MWO5PRfIf0k/nlrjX/guMSVe7+C0hQu9TGMSc=
28+
sigs.k8s.io/cluster-api v1.5.8 h1:flOuCuCDX129aqZ9qN0l1a6ZKdWTOlJGZgDOQlccP8w=
29+
sigs.k8s.io/cluster-api v1.5.8/go.mod h1:V8qEU5hfbHtWtiRxnJ6+ytFW6bbyjHLZY3DBSyQCGA0=
3030
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240311182002-eeab3ceb5ecc h1:YNVYlb2EBQwE+BrYRyxXymRlbblU/JS11yC1TL9Kisc=
3131
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240311182002-eeab3ceb5ecc/go.mod h1:yv3WQ/1osKOOfvInXmY7Bj/XHDG57suL6NXBdW5h8Rg=
3232
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d h1:KLiQzLW3RZJR19+j4pw2h5iioyAyqCkDBEAFdnGa3N8=

‎test/e2e/config/cloudstack.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ images:
1515
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
1616

1717
# Cluster API v1beta1 Preloads
18-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.5.7
18+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.5.8
1919
loadBehavior: tryLoad
20-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.5.7
20+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.5.8
2121
loadBehavior: tryLoad
22-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.5.7
22+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.5.8
2323
loadBehavior: tryLoad
24-
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.5.7
24+
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.5.8
2525
loadBehavior: tryLoad
26-
- name: quay.io/jetstack/cert-manager-cainjector:v1.14.2
26+
- name: quay.io/jetstack/cert-manager-cainjector:v1.14.4
2727
loadBehavior: tryLoad
28-
- name: quay.io/jetstack/cert-manager-webhook:v1.14.2
28+
- name: quay.io/jetstack/cert-manager-webhook:v1.14.4
2929
loadBehavior: tryLoad
30-
- name: quay.io/jetstack/cert-manager-controller:v1.14.2
30+
- name: quay.io/jetstack/cert-manager-controller:v1.14.4
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.5.7
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/core-components.yaml"
37+
- name: v1.5.8
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.8/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
replacements:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: BootstrapProvider
4949
versions:
50-
- name: v1.5.7
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/bootstrap-components.yaml"
50+
- name: v1.5.8
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.8/bootstrap-components.yaml"
5252
type: "url"
5353
contract: v1beta1
5454
replacements:
@@ -60,8 +60,8 @@ providers:
6060
- name: kubeadm
6161
type: ControlPlaneProvider
6262
versions:
63-
- name: v1.5.7
64-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.7/control-plane-components.yaml"
63+
- name: v1.5.8
64+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.8/control-plane-components.yaml"
6565
type: "url"
6666
contract: v1beta1
6767
replacements:

‎test/e2e/go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ go 1.21
44

55
require (
66
github.com/Shopify/toxiproxy/v2 v2.5.0
7-
github.com/apache/cloudstack-go/v2 v2.16.0
7+
github.com/apache/cloudstack-go/v2 v2.16.1
88
github.com/blang/semver v3.5.1+incompatible
9-
github.com/onsi/ginkgo/v2 v2.11.0
10-
github.com/onsi/gomega v1.27.8
9+
github.com/onsi/ginkgo/v2 v2.19.0
10+
github.com/onsi/gomega v1.33.1
1111
gopkg.in/yaml.v3 v3.0.1
1212
k8s.io/api v0.27.14
1313
k8s.io/apimachinery v0.27.14
1414
k8s.io/klog/v2 v2.90.1
1515
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
16-
sigs.k8s.io/cluster-api v1.5.7
17-
sigs.k8s.io/cluster-api/test v1.5.7
16+
sigs.k8s.io/cluster-api v1.5.8
17+
sigs.k8s.io/cluster-api/test v1.5.8
1818
sigs.k8s.io/controller-runtime v0.15.3
1919
)
2020

@@ -36,19 +36,19 @@ require (
3636
github.com/coredns/corefile-migration v1.0.21 // indirect
3737
github.com/davecgh/go-spew v1.1.1 // indirect
3838
github.com/docker/distribution v2.8.2+incompatible // indirect
39-
github.com/docker/docker v24.0.7+incompatible // indirect
39+
github.com/docker/docker v24.0.9+incompatible // indirect
4040
github.com/docker/go-connections v0.4.0 // indirect
4141
github.com/docker/go-units v0.4.0 // indirect
4242
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
4343
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
4444
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4545
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4646
github.com/fsnotify/fsnotify v1.6.0 // indirect
47-
github.com/go-logr/logr v1.3.0 // indirect
47+
github.com/go-logr/logr v1.4.1 // indirect
4848
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4949
github.com/go-openapi/jsonreference v0.20.2 // indirect
5050
github.com/go-openapi/swag v0.22.3 // indirect
51-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
51+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5252
github.com/gobuffalo/flect v1.0.2 // indirect
5353
github.com/gogo/protobuf v1.3.2 // indirect
5454
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -61,7 +61,7 @@ require (
6161
github.com/google/go-github/v48 v48.2.0 // indirect
6262
github.com/google/go-querystring v1.1.0 // indirect
6363
github.com/google/gofuzz v1.2.0 // indirect
64-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
64+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
6565
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
6666
github.com/google/uuid v1.3.1 // indirect
6767
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -99,14 +99,14 @@ require (
9999
github.com/stoewer/go-strcase v1.2.0 // indirect
100100
github.com/subosito/gotenv v1.4.2 // indirect
101101
github.com/valyala/fastjson v1.6.4 // indirect
102-
golang.org/x/crypto v0.21.0 // indirect
103-
golang.org/x/net v0.23.0 // indirect
102+
golang.org/x/crypto v0.23.0 // indirect
103+
golang.org/x/net v0.25.0 // indirect
104104
golang.org/x/oauth2 v0.11.0 // indirect
105-
golang.org/x/sys v0.18.0 // indirect
106-
golang.org/x/term v0.18.0 // indirect
107-
golang.org/x/text v0.14.0 // indirect
105+
golang.org/x/sys v0.20.0 // indirect
106+
golang.org/x/term v0.20.0 // indirect
107+
golang.org/x/text v0.15.0 // indirect
108108
golang.org/x/time v0.3.0 // indirect
109-
golang.org/x/tools v0.16.1 // indirect
109+
golang.org/x/tools v0.21.0 // indirect
110110
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
111111
google.golang.org/appengine v1.6.7 // indirect
112112
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect

0 commit comments

Comments
 (0)