Skip to content

Commit 78c5dcf

Browse files
JustinKuliopenshift-merge-robot
authored andcommitted
Replace helm dependency to avoid vulnerability
It doesn't seem likely that we were particularly affected by the vulnerability, since our "input" is automatically limited in length by kubernetes, but it's easy enough to just move to a version unaffected. Due to complications in dependencies, this also required updating some k8s libraries to v0.25.0 Refs: - stolostron/backlog#25412 Signed-off-by: Justin Kulikauskas <[email protected]>
1 parent 2e0b8a6 commit 78c5dcf

File tree

2 files changed

+129
-561
lines changed

2 files changed

+129
-561
lines changed

go.mod

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ module open-cluster-management.io/governance-policy-addon-controller
33
go 1.18
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.1.3
7-
github.com/onsi/gomega v1.18.1
6+
github.com/onsi/ginkgo/v2 v2.1.4
7+
github.com/onsi/gomega v1.19.0
88
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc
99
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0
1010
github.com/spf13/cobra v1.4.0
1111
github.com/spf13/pflag v1.0.5
12-
k8s.io/apimachinery v0.24.3
13-
k8s.io/client-go v0.24.3
14-
k8s.io/component-base v0.24.3
12+
k8s.io/apimachinery v0.25.0
13+
k8s.io/client-go v0.25.0
14+
k8s.io/component-base v0.25.0
1515
open-cluster-management.io/addon-framework v0.4.1-0.20220805023606-4de6c788fddf
1616
open-cluster-management.io/api v0.6.0
1717
sigs.k8s.io/controller-runtime v0.11.2
1818
)
1919

2020
require (
21-
github.com/BurntSushi/toml v0.3.1 // indirect
21+
github.com/BurntSushi/toml v1.0.0 // indirect
2222
github.com/Masterminds/goutils v1.1.1 // indirect
2323
github.com/Masterminds/semver/v3 v3.1.1 // indirect
2424
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
@@ -30,15 +30,15 @@ require (
3030
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3131
github.com/coreos/go-semver v0.3.0 // indirect
3232
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
33-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
33+
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
3434
github.com/davecgh/go-spew v1.1.1 // indirect
35-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
35+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
3636
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3737
github.com/fatih/structs v1.1.0 // indirect
3838
github.com/felixge/httpsnoop v1.0.1 // indirect
3939
github.com/fsnotify/fsnotify v1.5.1 // indirect
4040
github.com/ghodss/yaml v1.0.0 // indirect
41-
github.com/go-logr/logr v1.2.0 // indirect
41+
github.com/go-logr/logr v1.2.3 // indirect
4242
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4343
github.com/go-openapi/jsonreference v0.19.5 // indirect
4444
github.com/go-openapi/swag v0.19.14 // indirect
@@ -47,8 +47,8 @@ require (
4747
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4848
github.com/golang/protobuf v1.5.2 // indirect
4949
github.com/google/gnostic v0.5.7-v3refs // indirect
50-
github.com/google/go-cmp v0.5.5 // indirect
51-
github.com/google/gofuzz v1.1.0 // indirect
50+
github.com/google/go-cmp v0.5.6 // indirect
51+
github.com/google/gofuzz v1.2.0 // indirect
5252
github.com/google/uuid v1.2.0 // indirect
5353
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5454
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
@@ -59,8 +59,8 @@ require (
5959
github.com/json-iterator/go v1.1.12 // indirect
6060
github.com/mailru/easyjson v0.7.6 // indirect
6161
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
62-
github.com/mitchellh/copystructure v1.1.1 // indirect
63-
github.com/mitchellh/reflectwalk v1.0.1 // indirect
62+
github.com/mitchellh/copystructure v1.2.0 // indirect
63+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6464
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6565
github.com/modern-go/reflect2 v1.0.2 // indirect
6666
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -74,13 +74,13 @@ require (
7474
github.com/prometheus/procfs v0.7.3 // indirect
7575
github.com/shopspring/decimal v1.2.0 // indirect
7676
github.com/sirupsen/logrus v1.8.1 // indirect
77-
github.com/spf13/cast v1.3.1 // indirect
77+
github.com/spf13/cast v1.4.1 // indirect
7878
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
7979
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
8080
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
81-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
82-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
83-
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
81+
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
82+
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
83+
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
8484
go.opentelemetry.io/contrib v0.20.0 // indirect
8585
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
8686
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -95,34 +95,36 @@ require (
9595
go.uber.org/atomic v1.7.0 // indirect
9696
go.uber.org/multierr v1.6.0 // indirect
9797
go.uber.org/zap v1.19.1 // indirect
98-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
99-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
98+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
99+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
100100
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
101-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
102-
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
101+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
102+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
103103
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
104104
golang.org/x/text v0.3.7 // indirect
105105
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
106106
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
107107
google.golang.org/appengine v1.6.7 // indirect
108-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
109-
google.golang.org/grpc v1.40.0 // indirect
110-
google.golang.org/protobuf v1.27.1 // indirect
108+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
109+
google.golang.org/grpc v1.47.0 // indirect
110+
google.golang.org/protobuf v1.28.0 // indirect
111111
gopkg.in/inf.v0 v0.9.1 // indirect
112112
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
113113
gopkg.in/yaml.v2 v2.4.0 // indirect
114-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
114+
gopkg.in/yaml.v3 v3.0.1 // indirect
115115
helm.sh/helm/v3 v3.7.2 // indirect
116-
k8s.io/api v0.24.3 // indirect
117-
k8s.io/apiextensions-apiserver v0.24.0 // indirect
118-
k8s.io/apiserver v0.24.0 // indirect
119-
k8s.io/klog/v2 v2.60.1 // indirect
116+
k8s.io/api v0.25.0 // indirect
117+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
118+
k8s.io/apiserver v0.25.0 // indirect
119+
k8s.io/klog/v2 v2.70.1 // indirect
120120
k8s.io/kube-aggregator v0.24.0 // indirect
121-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
122-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
123-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
124-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
121+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
122+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
123+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
124+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
125125
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
126-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
126+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
127127
sigs.k8s.io/yaml v1.3.0 // indirect
128128
)
129+
130+
replace helm.sh/helm/v3 => helm.sh/helm/v3 v3.9.4 // sonatype-2022-5277; see helm v3.9.4 release notes

0 commit comments

Comments
 (0)