Skip to content

Commit

Permalink
Merge pull request red-hat-storage#2315 from malayparida2000/dependan…
Browse files Browse the repository at this point in the history
…cies

Update direct dependencies like rook,noobaa,openshift,operator framework & others
  • Loading branch information
openshift-merge-bot[bot] authored and rewantsoni committed Dec 18, 2023
2 parents 723ff01 + fc5886e commit 88a8f72
Show file tree
Hide file tree
Showing 243 changed files with 14,013 additions and 5,462 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
2 changes: 1 addition & 1 deletion catalog/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ schema: olm.channel
package: noobaa-operator
name: alpha
entries:
- name: noobaa-operator.v5.14.0
- name: noobaa-operator.v5.15.0
Loading

0 comments on commit 88a8f72

Please sign in to comment.