-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is an automated cherry-pick of #57791
Signed-off-by: ti-chi-bot <[email protected]>
- Loading branch information
1 parent
d97f0ee
commit e0cb546
Showing
3 changed files
with
129 additions
and
0 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 |
|---|---|---|
|
|
@@ -2798,15 +2798,37 @@ def go_deps(): | |
| name = "com_github_onsi_ginkgo_v2", | ||
| build_file_proto_mode = "disable_global", | ||
| importpath = "github.com/onsi/ginkgo/v2", | ||
| <<<<<<< HEAD | ||
| sum = "h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=", | ||
| version = "v2.9.1", | ||
| ======= | ||
| sha256 = "4865aab6c56b0d29a93cfe56206b586f1c9f36fde5a66e85650576344861b7cc", | ||
| strip_prefix = "github.com/onsi/ginkgo/[email protected]", | ||
| urls = [ | ||
| "http://bazel-cache.pingcap.net:8080/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
| "http://ats.apps.svc/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
| "https://cache.hawkingrei.com/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
| "https://storage.googleapis.com/pingcapmirror/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
| ], | ||
| >>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
| ) | ||
| go_repository( | ||
| name = "com_github_onsi_gomega", | ||
| build_file_proto_mode = "disable_global", | ||
| importpath = "github.com/onsi/gomega", | ||
| <<<<<<< HEAD | ||
| sum = "h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=", | ||
| version = "v1.18.1", | ||
| ======= | ||
| sha256 = "923e8d0a1f95b3989f31c45142dee0b80a0aaa00cfa210bbd4d059f7046d12a8", | ||
| strip_prefix = "github.com/onsi/[email protected]", | ||
| urls = [ | ||
| "http://bazel-cache.pingcap.net:8080/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
| "http://ats.apps.svc/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
| "https://cache.hawkingrei.com/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
| "https://storage.googleapis.com/pingcapmirror/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
| ], | ||
| >>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
| ) | ||
| go_repository( | ||
| name = "com_github_openpeedeep_depguard", | ||
|
|
@@ -5024,15 +5046,37 @@ def go_deps(): | |
| name = "io_k8s_api", | ||
| build_file_proto_mode = "disable", | ||
| importpath = "k8s.io/api", | ||
| <<<<<<< HEAD | ||
| sum = "h1:J0hann2hfxWr1hinZIDefw7Q96wmCBx6SSB8IY0MdDg=", | ||
| version = "v0.24.0", | ||
| ======= | ||
| sha256 = "ae7b519f36431bc55fa56c47a51c1c37cf9e0df7e9d23741b3e839426d2627ff", | ||
| strip_prefix = "k8s.io/[email protected]", | ||
| urls = [ | ||
| "http://bazel-cache.pingcap.net:8080/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
| "http://ats.apps.svc/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
| "https://cache.hawkingrei.com/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
| "https://storage.googleapis.com/pingcapmirror/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
| ], | ||
| >>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
| ) | ||
| go_repository( | ||
| name = "io_k8s_apimachinery", | ||
| build_file_proto_mode = "disable", | ||
| importpath = "k8s.io/apimachinery", | ||
| <<<<<<< HEAD | ||
| sum = "h1:ydFCyC/DjCvFCHK5OPMKBlxayQytB8pxy8YQInd5UyQ=", | ||
| version = "v0.24.0", | ||
| ======= | ||
| sha256 = "8dd5f53bf72f7bd6323bcc8f9f45823b30fc350daee4ab2d9e27cf1960d06b25", | ||
| strip_prefix = "k8s.io/[email protected]", | ||
| urls = [ | ||
| "http://bazel-cache.pingcap.net:8080/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
| "http://ats.apps.svc/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
| "https://cache.hawkingrei.com/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
| "https://storage.googleapis.com/pingcapmirror/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
| ], | ||
| >>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
| ) | ||
| go_repository( | ||
| name = "io_k8s_client_go", | ||
|
|
||
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
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