Skip to content

Commit

Permalink
Updates to avoid CVE's (#464)
Browse files Browse the repository at this point in the history
* go.mod updates for security and CVEs

* Bump CDI and github.com/ulikunitz

* Drop prometheus/common dependency

This avoids using the logger from prometheus/common and
instead uses the controller-runtime setup logger instead

* Bump miekg/dns

* Correct CVE comment for containerd
  • Loading branch information
dprince authored Dec 14, 2021
1 parent f62d824 commit e81d7b4
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 29 deletions.
22 changes: 19 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/go-git/go-git/v5 v5.3.0
github.com/go-logr/logr v0.4.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/google/uuid v1.1.2
github.com/google/uuid v1.2.0
github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200626054723-37f83d1996bc
github.com/metal3-io/baremetal-operator v0.0.0-20201116105209-c72e2e0d8803
github.com/nmstate/kubernetes-nmstate v0.33.0
Expand All @@ -19,7 +19,6 @@ require (
github.com/openshift/cluster-api v0.0.0-20191129101638-b09907ac6668
github.com/openshift/sriov-network-operator v0.0.0-20201204053545-49045c36efb9
github.com/pkg/errors v0.9.1
github.com/prometheus/common v0.26.0
github.com/spf13/cobra v1.1.3
github.com/tidwall/gjson v1.9.3
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
Expand All @@ -31,23 +30,34 @@ require (
k8s.io/client-go v12.0.0+incompatible
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
kubevirt.io/client-go v0.34.2
kubevirt.io/containerized-data-importer v1.23.5
kubevirt.io/containerized-data-importer v1.39.0
sigs.k8s.io/controller-runtime v0.9.7
sigs.k8s.io/yaml v1.2.0
)

replace (
// required by Microsoft/hcsshim, containers/storage, sriov-network-operator
// Not used within this Operator.
// Bump to avoid CVE detection with earlier versions (v1.3.2). https://bugzilla.redhat.com/show_bug.cgi?id=1899487, https://bugzilla.redhat.com/show_bug.cgi?id=1982681
github.com/containerd/containerd => github.com/containerd/containerd v1.5.4
// dependabot fixes
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompatible
github.com/irifrance/gini => github.com/go-air/gini v1.0.4

// required by client-go, prometheus-operator..
// Bump to avoid CVE detection with v1.1.22. https://bugzilla.redhat.com/show_bug.cgi?id=1786761
github.com/miekg/dns => github.com/miekg/dns v1.1.43

// controller runtime
github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd // release-4.5
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5

// CDI
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a

// CDI. Bump to avoid CVE with v0.5.7
github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.10

google.golang.org/grpc => google.golang.org/grpc v1.26.0

// pin to v0.21.4
Expand All @@ -69,6 +79,11 @@ replace (
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
k8s.io/kubelet => k8s.io/kubelet v0.21.4

// required by kubernetes-csi/external-snapshotter, kubevirt.io/client-go. Bump to avoid CVE detection with v1.14.0: https://bugzilla.redhat.com/show_bug.cgi?id=1757701
// Not used within this Operator.
k8s.io/kubernetes => k8s.io/kubernetes v1.14.8

k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.4
k8s.io/metrics => k8s.io/metrics v0.21.4
k8s.io/node-api => k8s.io/node-api v0.21.4
Expand All @@ -78,4 +93,5 @@ replace (

// pinned because no tag supports 1.18 yet
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06

)
Loading

0 comments on commit e81d7b4

Please sign in to comment.