Skip to content

Commit 5bbb717

Browse files
authored
Merge branch 'main' into reconcile-capc-cluster-to-cks
2 parents 69b2fe9 + c43cec6 commit 5bbb717

File tree

5 files changed

+150
-614
lines changed

5 files changed

+150
-614
lines changed

.github/workflows/go-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
- name: Run go test with coverage
1919
run: COVER_PROFILE=coverage.txt make test
2020
- name: Codecov upload
21-
uses: codecov/codecov-action@v4.4.1
21+
uses: codecov/codecov-action@v4.5.0
2222
with:
2323
files: ./cover.out

go.mod

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

55
require (
66
github.com/apache/cloudstack-go/v2 v2.16.1
7-
github.com/go-logr/logr v1.2.4
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
10-
github.com/jellydator/ttlcache/v3 v3.1.1
11-
github.com/onsi/ginkgo/v2 v2.11.0
12-
github.com/onsi/gomega v1.27.8
10+
github.com/jellydator/ttlcache/v3 v3.2.0
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.16.0
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.15.0
1818
gopkg.in/yaml.v3 v3.0.1
19-
k8s.io/api v0.26.1
20-
k8s.io/apimachinery v0.26.1
21-
k8s.io/client-go v0.26.1
22-
k8s.io/component-base v0.26.1
19+
k8s.io/api v0.26.15
20+
k8s.io/apimachinery v0.26.15
21+
k8s.io/client-go v0.26.15
22+
k8s.io/component-base v0.26.15
2323
k8s.io/klog/v2 v2.80.1
2424
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
25-
sigs.k8s.io/cluster-api v1.4.8
26-
sigs.k8s.io/controller-runtime v0.14.5
25+
sigs.k8s.io/cluster-api v1.4.9
26+
sigs.k8s.io/controller-runtime v0.14.7
2727
)
2828

2929
require (
@@ -43,16 +43,16 @@ require (
4343
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4444
github.com/go-openapi/jsonreference v0.20.0 // indirect
4545
github.com/go-openapi/swag v0.22.3 // indirect
46-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
46+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4747
github.com/gobuffalo/flect v1.0.2 // indirect
4848
github.com/gogo/protobuf v1.3.2 // indirect
4949
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
50-
github.com/golang/protobuf v1.5.3 // indirect
50+
github.com/golang/protobuf v1.5.4 // indirect
5151
github.com/google/gnostic v0.6.9 // indirect
52-
github.com/google/go-cmp v0.5.9 // indirect
52+
github.com/google/go-cmp v0.6.0 // indirect
5353
github.com/google/gofuzz v1.2.0 // indirect
54-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
55-
github.com/google/uuid v1.3.0 // indirect
54+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
55+
github.com/google/uuid v1.3.1 // indirect
5656
github.com/hashicorp/errwrap v1.0.0 // indirect
5757
github.com/imdario/mergo v0.3.13 // indirect
5858
github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -70,19 +70,19 @@ require (
7070
github.com/rogpeppe/go-internal v1.9.0 // indirect
7171
github.com/spf13/cobra v1.6.1 // indirect
7272
go.uber.org/atomic v1.10.0 // indirect
73-
golang.org/x/net v0.23.0 // indirect
74-
golang.org/x/oauth2 v0.6.0 // indirect
75-
golang.org/x/sync v0.2.0 // indirect
76-
golang.org/x/sys v0.18.0 // indirect
77-
golang.org/x/term v0.18.0 // indirect
73+
golang.org/x/net v0.25.0 // indirect
74+
golang.org/x/oauth2 v0.11.0 // indirect
75+
golang.org/x/sync v0.7.0 // indirect
76+
golang.org/x/sys v0.20.0 // indirect
77+
golang.org/x/term v0.20.0 // indirect
7878
golang.org/x/time v0.3.0 // indirect
79-
golang.org/x/tools v0.9.3 // indirect
79+
golang.org/x/tools v0.21.0 // indirect
8080
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
8181
google.golang.org/appengine v1.6.7 // indirect
8282
google.golang.org/protobuf v1.34.2 // indirect
8383
gopkg.in/inf.v0 v0.9.1 // indirect
8484
gopkg.in/yaml.v2 v2.4.0 // indirect
85-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
85+
k8s.io/apiextensions-apiserver v0.26.10 // indirect
8686
k8s.io/cluster-bootstrap v0.25.3 // indirect
8787
k8s.io/kube-openapi v0.0.0-20221106113015-f73e7dbcfe29 // indirect
8888
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect

0 commit comments

Comments
 (0)