-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into odh-issues19
- Loading branch information
Showing
2 changed files
with
22 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ require ( | |
| github.com/google/go-cmp v0.5.9 | ||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 | ||
| google.golang.org/grpc v1.56.3 | ||
| google.golang.org/protobuf v1.30.0 | ||
| google.golang.org/protobuf v1.32.0 | ||
| sigs.k8s.io/controller-runtime v0.14.1 | ||
| ) | ||
|
|
||
|
|
@@ -19,13 +19,13 @@ require ( | |
| github.com/json-iterator/go v1.1.12 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.2 // indirect | ||
| github.com/rogpeppe/go-internal v1.11.0 // indirect | ||
| github.com/rogpeppe/go-internal v1.12.0 // indirect | ||
| go.uber.org/atomic v1.7.0 // indirect | ||
| go.uber.org/multierr v1.6.0 // indirect | ||
| go.uber.org/zap v1.24.0 // indirect | ||
| golang.org/x/net v0.10.0 // indirect | ||
| golang.org/x/sys v0.13.0 // indirect | ||
| golang.org/x/text v0.13.0 // indirect | ||
| golang.org/x/sys v0.15.0 // indirect | ||
| golang.org/x/text v0.14.0 // indirect | ||
| google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
|
|
@@ -37,9 +37,12 @@ require ( | |
| ) | ||
|
|
||
| replace ( | ||
| // fixes pkg/mod/github.com/golang/[email protected]/internal/logsink/logsink.go:123:41: undeclared name: any (requires version go1.18 or later) | ||
| // remove when updating to go lang 1.19 | ||
| github.com/golang/glog => github.com/golang/glog v1.0.0 | ||
| // The x/crypto is pulled from golang.org/x/[email protected] | ||
| // Fixes CVE-2023-48795 - golang.org/x/crypto Authentication Bypass by Capture-replay | ||
| golang.org/x/crypto => golang.org/x/crypto v0.17.0 | ||
| golang.org/x/net => golang.org/x/net v0.17.0 | ||
|
|
||
| // Fixes github.com/elazarl/goproxy Denial of Service (DoS), the dependency was removed in v0.27.0 | ||
| // Remove below when upgrading to controller-runtime 0.15.x or apimachinery to 0.27.x | ||
| k8s.io/apimachinery => k8s.io/apimachinery v0.27.0 | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters