Skip to content

Commit

Permalink
Update direct dependencies like rook,noobaa,openshift & others
Browse files Browse the repository at this point in the history
Also include go mod tidy && go mod vendor changes for both the main
module & the api module.

Signed-off-by: Malay Kumar Parida <[email protected]>
  • Loading branch information
malayparida2000 committed Dec 18, 2023
1 parent 723ff01 commit 286ff3a
Show file tree
Hide file tree
Showing 235 changed files with 13,356 additions and 5,442 deletions.
10 changes: 3 additions & 7 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/red-hat-storage/ocs-operator/api/v4
go 1.20

require (
github.com/noobaa/noobaa-operator/v5 v5.14.0
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
github.com/noobaa/noobaa-operator/v5 v5.0.0-20231213124549-5d7b0417716d
github.com/openshift/api v0.0.0-20231212225112-7cca8a108d7b
github.com/openshift/custom-resource-status v1.1.2
github.com/rook/rook/pkg/apis v0.0.0-20231211195439-c80ea7b64424
github.com/rook/rook/pkg/apis v0.0.0-20231215165123-32de0fb5f69b
k8s.io/api v0.28.4
k8s.io/apimachinery v0.28.4
)
Expand Down Expand Up @@ -86,10 +86,6 @@ exclude (
// but are picked when updating dependencies.
github.com/openshift/api v3.9.0+incompatible
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible

// Noobaa operator is requiring this version of rook which is not compatible with the
// version of rook we are using. Because it uses 2 go.mods
github.com/rook/rook v1.12.3-0.20230823002913-59e66edf92f7
// Exclude pre-go-mod kubernetes tags, because they are older
// than v0.x releases but are picked when updating dependencies.
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
Expand Down
12 changes: 6 additions & 6 deletions api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/noobaa/noobaa-operator/v5 v5.14.0 h1:OjmYylFBQ0bMZi7yWtYc+Tc5g3n7nQp5gXNC5PivCzA=
github.com/noobaa/noobaa-operator/v5 v5.14.0/go.mod h1:dGjhx/zjLbYIoXVtIpXEvr8j4aUiQi1bpl+EVXmhx3E=
github.com/noobaa/noobaa-operator/v5 v5.0.0-20231213124549-5d7b0417716d h1:zlBMMEl0uFEFiqm174Y3zW5pKUVv+9B9K0X0pE6Ero4=
github.com/noobaa/noobaa-operator/v5 v5.0.0-20231213124549-5d7b0417716d/go.mod h1:48xbW+3yjKwYY32WqE3xTFhNzgIwOUEhPubqbDWIIkQ=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down Expand Up @@ -616,8 +616,8 @@ github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/openshift/api v0.0.0-20210105115604-44119421ec6b/go.mod h1:aqU5Cq+kqKKPbDMqxo9FojgDeSpNJI7iuskjXjtojDg=
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4 h1:5RyeLvTSZEn/fDQA6e6+qIvFPssWjreY8pbwfg4/EEQ=
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/api v0.0.0-20231212225112-7cca8a108d7b h1:H7Iu44OPp8/6mp2jSixn/9mTbprXBATMmw9GQrnnyK4=
github.com/openshift/api v0.0.0-20231212225112-7cca8a108d7b/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47/go.mod h1:u7NRAjtYVAKokiI9LouzTv4mhds8P4S1TwdVAfbjKSk=
github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4=
Expand Down Expand Up @@ -674,8 +674,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rook/rook/pkg/apis v0.0.0-20231211195439-c80ea7b64424 h1:HyAkh3ViNuiwy9KDutl2ZnpVAQH6ovwcTSm7RFxr6mI=
github.com/rook/rook/pkg/apis v0.0.0-20231211195439-c80ea7b64424/go.mod h1:O8Sz/J0NOLteScktaNByccS8u5RVAvi9AvDegO2I2rM=
github.com/rook/rook/pkg/apis v0.0.0-20231215165123-32de0fb5f69b h1:4Wf9IbN7OiKLMooLYwXb8q7IolfGtjtUcE0G2HSFaKQ=
github.com/rook/rook/pkg/apis v0.0.0-20231215165123-32de0fb5f69b/go.mod h1:O8Sz/J0NOLteScktaNByccS8u5RVAvi9AvDegO2I2rM=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions api/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ github.com/modern-go/reflect2
# github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
## explicit
github.com/munnerz/goautoneg
# github.com/noobaa/noobaa-operator/v5 v5.14.0
# github.com/noobaa/noobaa-operator/v5 v5.0.0-20231213124549-5d7b0417716d
## explicit; go 1.20
github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1
# github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
# github.com/openshift/api v0.0.0-20231212225112-7cca8a108d7b
## explicit; go 1.20
github.com/openshift/api/quota/v1
github.com/openshift/api/security/v1
Expand All @@ -167,7 +167,7 @@ github.com/openshift/custom-resource-status/conditions/v1
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
# github.com/rook/rook/pkg/apis v0.0.0-20231211195439-c80ea7b64424
# github.com/rook/rook/pkg/apis v0.0.0-20231215165123-32de0fb5f69b
## explicit; go 1.20
github.com/rook/rook/pkg/apis/ceph.rook.io
github.com/rook/rook/pkg/apis/ceph.rook.io/v1
Expand Down
57 changes: 27 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@ replace github.com/red-hat-storage/ocs-operator/api/v4 => ./api
require (
github.com/RHsyseng/operator-utils v1.4.13
github.com/blang/semver/v4 v4.0.0
github.com/ceph/ceph-csi/api v0.0.0-20230713140649-15931b2e4f19
github.com/ceph/go-ceph v0.24.0
github.com/ceph/ceph-csi/api v0.0.0-20231215102045-d3d17d583e57
github.com/ceph/go-ceph v0.25.0
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
github.com/go-logr/logr v1.3.0
github.com/google/uuid v1.4.0
github.com/google/uuid v1.5.0
github.com/imdario/mergo v0.3.16
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
github.com/noobaa/noobaa-operator/v5 v5.14.0
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
github.com/noobaa/noobaa-operator/v5 v5.0.0-20231213124549-5d7b0417716d
github.com/oklog/run v1.1.0
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.10
github.com/openshift/api v0.0.0-20231204192004-bfea29e5e6c4
github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533
github.com/openshift/client-go v0.0.0-20231005121823-e81400b97c46
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/gomega v1.30.0
github.com/openshift/api v0.0.0-20231212225112-7cca8a108d7b
github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880
github.com/openshift/client-go v0.0.0-20231205143348-30c04aae71b2
github.com/openshift/custom-resource-status v1.1.2
github.com/operator-framework/api v0.17.7-0.20230626210316-aa3e49803e7b
github.com/operator-framework/operator-lib v0.11.1-0.20230717184314-6efbe3a22f6f
github.com/operator-framework/operator-lifecycle-manager v0.25.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.69.1
github.com/operator-framework/api v0.20.0
github.com/operator-framework/operator-lib v0.11.1-0.20231020142438-152ee1fb7f83
github.com/operator-framework/operator-lifecycle-manager v0.26.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.70.0
github.com/prometheus-operator/prometheus-operator/pkg/client v0.70.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-00010101000000-000000000000
github.com/rook/rook v1.13.0-beta.0
github.com/rook/rook/pkg/apis v0.0.0-20231211195439-c80ea7b64424
github.com/rook/rook v1.13.0
github.com/rook/rook/pkg/apis v0.0.0-20231215165123-32de0fb5f69b
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
go.uber.org/multierr v1.11.0
golang.org/x/net v0.19.0
google.golang.org/grpc v1.56.3
google.golang.org/grpc v1.60.0
google.golang.org/protobuf v1.31.0
gopkg.in/ini.v1 v1.67.0
gotest.tools/v3 v3.5.0
Expand All @@ -48,13 +48,13 @@ require (
k8s.io/client-go v0.28.4
k8s.io/klog/v2 v2.110.1
k8s.io/utils v0.0.0-20231127182322-b307cd553661
open-cluster-management.io/api v0.11.0
open-cluster-management.io/api v0.12.0
sigs.k8s.io/controller-runtime v0.16.3
)

require (
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go v1.48.4 // indirect
github.com/aws/aws-sdk-go v1.48.12 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -65,7 +65,7 @@ require (
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/analysis v0.20.0 // indirect
github.com/go-openapi/errors v0.20.1 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
Expand Down Expand Up @@ -102,7 +102,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/libopenstorage/secrets v0.0.0-20231011182615-5f4b25ceede1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -111,15 +111,15 @@ require (
github.com/oklog/ulid v1.3.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
go.mongodb.org/mongo-driver v1.9.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
Expand All @@ -128,25 +128,22 @@ require (
golang.org/x/tools v0.16.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.28.4 // indirect
k8s.io/component-base v0.28.4 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-aggregator v0.26.1 // indirect
k8s.io/kube-aggregator v0.27.1 // indirect
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
sigs.k8s.io/container-object-storage-interface-api v0.1.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
github.com/noobaa/noobaa-operator/v5 => github.com/noobaa/noobaa-operator/v5 v5.0.0-20230919064207-0b6979c00d6a
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by rook
)
replace github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by rook

exclude (
// This tag doesn't exist, but is imported by github.com/portworx/sched-ops.
Expand Down
Loading

0 comments on commit 286ff3a

Please sign in to comment.