Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ocs-operator direct dependencies #2896

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+12,651 −12,563
Open

Update ocs-operator direct dependencies #2896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913114a
Update ocs-operator direct dependencies
malayparida2000 Nov 13, 2024
ff3e55b
Add required changes after api update
malayparida2000 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
39 changes: 19 additions & 20 deletions api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
module github.com/red-hat-storage/ocs-operator/api/v4

go 1.22.0
go 1.22.7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid locking this to a specific z-release? Can we just keep it 1.22.0 ? Toolchain version can be 1.22.7.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@umangachapagain is there a reason for that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That'd allow me to use any 1.22.z instead of forcing me to a specific version ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sticking to go 1.22.0 may open us up to potential CVEs, and I have confirmed with the Build team and Go 1.22.7 is the latest available version in their environment & it's the latest available in openshift CI env as well. So I see no harm in using that.

Copy link
Contributor Author

@malayparida2000 malayparida2000 Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That'd allow me to use any 1.22.z instead of forcing me to a specific version ?

I think by that you meant specifying only 1.22 not 1.22.0? If we specify just 1.22 it will pull 1.22.9 which is not available in Builder images so it will cause issue in openshift-ci as well as build environment.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just defines the minimal version, it is fine to use it like that, especially if you also set the toolchain directive to a more current version which defines the recommended version. This should not really be blocking people from compiling the code on go versions that do have some CVEs in them.


require (
github.com/noobaa/noobaa-operator/v5 v5.0.0-20240827070548-002966de315a
github.com/openshift/api v0.0.0-20240828125535-01b3675ba7b3
github.com/noobaa/noobaa-operator/v5 v5.0.0-20241112075542-b62bb7eb535d
github.com/openshift/api v0.0.0-20241112230646-1bc89e052086
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
github.com/rook/rook/pkg/apis v0.0.0-20240828225153-88eab510dd2b
k8s.io/api v0.31.0
k8s.io/apimachinery v0.31.0
github.com/rook/rook/pkg/apis v0.0.0-20241111155759-7822e6b19952
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
)

require (
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/containernetworking/cni v1.2.3 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
Expand All @@ -37,12 +37,12 @@ require (
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/vault/api v1.14.0 // indirect
github.com/hashicorp/vault/api v1.15.0 // indirect
github.com/hashicorp/vault/api/auth/approle v0.7.0 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.7.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.1 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.3 // indirect
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1 // indirect
github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -51,25 +51,24 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.20.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
google.golang.org/protobuf v1.35.1 // 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/client-go v0.31.0 // indirect
k8s.io/client-go v0.31.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
sigs.k8s.io/container-object-storage-interface-api v0.1.0 // indirect
sigs.k8s.io/controller-runtime v0.19.0 // indirect
Expand Down
89 changes: 44 additions & 45 deletions api/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions api/vendor/github.com/cenkalti/backoff/v3/.travis.yml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...github.com/cenkalti/backoff/v3/.gitignore → ...github.com/cenkalti/backoff/v4/.gitignore
View file
Open in desktop

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

0 ...or/github.com/cenkalti/backoff/v3/LICENSE → ...or/github.com/cenkalti/backoff/v4/LICENSE
View file
Open in desktop
File renamed without changes.
13 changes: 5 additions & 8 deletions .../github.com/cenkalti/backoff/v3/README.md → .../github.com/cenkalti/backoff/v4/README.md
View file
Open in desktop

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

0 ...github.com/cenkalti/backoff/v3/backoff.go → ...github.com/cenkalti/backoff/v4/backoff.go
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions ...github.com/cenkalti/backoff/v3/context.go → ...github.com/cenkalti/backoff/v4/context.go
View file
Open in desktop

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

76 changes: 69 additions & 7 deletions ...ub.com/cenkalti/backoff/v3/exponential.go → ...ub.com/cenkalti/backoff/v4/exponential.go
View file
Open in desktop

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

70 changes: 60 additions & 10 deletions ...r/github.com/cenkalti/backoff/v3/retry.go → ...r/github.com/cenkalti/backoff/v4/retry.go
View file
Open in desktop

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

Loading
Loading