Skip to content

Commit eb1c94e

Browse files
authored
chore: upgrade controller-runtime and fleet to fix CVEs (#182)
1 parent b3fa382 commit eb1c94e

File tree

7 files changed

+135
-235
lines changed

7 files changed

+135
-235
lines changed

go.mod

Lines changed: 39 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,88 +4,74 @@ go 1.22.3
44

55
require (
66
github.com/google/go-cmp v0.6.0
7-
github.com/onsi/ginkgo/v2 v2.13.0
8-
github.com/onsi/gomega v1.29.0
9-
github.com/prometheus/client_golang v1.17.0
10-
github.com/prometheus/common v0.44.0
11-
k8s.io/api v0.28.3
12-
k8s.io/apimachinery v0.28.3
13-
k8s.io/client-go v0.28.3
14-
k8s.io/klog/v2 v2.110.1
15-
sigs.k8s.io/controller-runtime v0.16.3
7+
github.com/onsi/ginkgo/v2 v2.17.2
8+
github.com/onsi/gomega v1.33.1
9+
github.com/prometheus/client_golang v1.19.1
10+
github.com/prometheus/common v0.55.0
11+
k8s.io/api v0.30.2
12+
k8s.io/apimachinery v0.30.2
13+
k8s.io/client-go v0.30.2
14+
k8s.io/klog/v2 v2.130.1
15+
sigs.k8s.io/controller-runtime v0.18.4
1616
)
1717

1818
require (
19-
github.com/stretchr/testify v1.8.4
20-
go.goms.io/fleet v0.9.7
21-
)
22-
23-
replace (
24-
// https://nvd.nist.gov/vuln/detail/CVE-2022-1996
25-
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
26-
27-
// https://nvd.nist.gov/vuln/detail/cve-2021-3121
28-
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
29-
30-
// https://avd.aquasec.com/nvd/2022/cve-2022-27191/
31-
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b
19+
github.com/stretchr/testify v1.9.0
20+
go.goms.io/fleet v0.10.5
3221
)
3322

3423
require (
3524
github.com/beorn7/perks v1.0.1 // indirect
36-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
25+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3726
github.com/davecgh/go-spew v1.1.1 // indirect
3827
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
39-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
28+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
4029
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
41-
github.com/fsnotify/fsnotify v1.6.0 // indirect
42-
github.com/go-logr/logr v1.3.0 // indirect
30+
github.com/fsnotify/fsnotify v1.7.0 // indirect
31+
github.com/go-logr/logr v1.4.2 // indirect
4332
github.com/go-logr/zapr v1.3.0 // indirect
44-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
45-
github.com/go-openapi/jsonreference v0.20.2 // indirect
46-
github.com/go-openapi/swag v0.22.4 // indirect
47-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
33+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
34+
github.com/go-openapi/jsonreference v0.21.0 // indirect
35+
github.com/go-openapi/swag v0.23.0 // indirect
36+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4837
github.com/gogo/protobuf v1.3.2 // indirect
4938
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
50-
github.com/golang/protobuf v1.5.3 // indirect
39+
github.com/golang/protobuf v1.5.4 // indirect
5140
github.com/google/gnostic-models v0.6.8 // indirect
5241
github.com/google/gofuzz v1.2.0 // indirect
53-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
54-
github.com/google/uuid v1.3.1 // indirect
42+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
43+
github.com/google/uuid v1.6.0 // indirect
5544
github.com/imdario/mergo v0.3.16 // indirect
5645
github.com/josharian/intern v1.0.0 // indirect
5746
github.com/json-iterator/go v1.1.12 // indirect
5847
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6048
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6149
github.com/modern-go/reflect2 v1.0.2 // indirect
6250
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6351
github.com/pkg/errors v0.9.1 // indirect
6452
github.com/pmezard/go-difflib v1.0.0 // indirect
65-
github.com/prometheus/client_model v0.5.0 // indirect
66-
github.com/prometheus/procfs v0.12.0 // indirect
53+
github.com/prometheus/client_model v0.6.1 // indirect
54+
github.com/prometheus/procfs v0.15.1 // indirect
6755
github.com/spf13/pflag v1.0.5 // indirect
6856
go.uber.org/multierr v1.11.0 // indirect
69-
go.uber.org/zap v1.26.0 // indirect
70-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
71-
golang.org/x/net v0.23.0 // indirect
72-
golang.org/x/oauth2 v0.13.0 // indirect
73-
golang.org/x/sys v0.18.0 // indirect
74-
golang.org/x/term v0.18.0 // indirect
75-
golang.org/x/text v0.14.0 // indirect
76-
golang.org/x/time v0.4.0 // indirect
77-
golang.org/x/tools v0.14.0 // indirect
57+
go.uber.org/zap v1.27.0 // indirect
58+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
59+
golang.org/x/net v0.26.0 // indirect
60+
golang.org/x/oauth2 v0.21.0 // indirect
61+
golang.org/x/sys v0.21.0 // indirect
62+
golang.org/x/term v0.21.0 // indirect
63+
golang.org/x/text v0.16.0 // indirect
64+
golang.org/x/time v0.5.0 // indirect
65+
golang.org/x/tools v0.22.0 // indirect
7866
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
79-
google.golang.org/appengine v1.6.8 // indirect
80-
google.golang.org/protobuf v1.33.0 // indirect
67+
google.golang.org/protobuf v1.34.2 // indirect
8168
gopkg.in/inf.v0 v0.9.1 // indirect
8269
gopkg.in/yaml.v2 v2.4.0 // indirect
8370
gopkg.in/yaml.v3 v3.0.1 // indirect
84-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
85-
k8s.io/component-base v0.28.3 // indirect
86-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
87-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
71+
k8s.io/apiextensions-apiserver v0.30.2 // indirect
72+
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
73+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
8874
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
89-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
90-
sigs.k8s.io/yaml v1.3.0 // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
76+
sigs.k8s.io/yaml v1.4.0 // indirect
9177
)

0 commit comments

Comments
 (0)