Skip to content

Commit

Permalink
update vendor for v3.2:
Browse files Browse the repository at this point in the history
use fork kubernetes repo to fix etcd pkg conflict
  • Loading branch information
zexi committed Aug 4, 2020
1 parent 9832610 commit 774b517
Show file tree
Hide file tree
Showing 62 changed files with 10 additions and 32,497 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ require (
sigs.k8s.io/testing_frameworks v0.1.1 // indirect
yunion.io/x/jsonutils v0.0.0-20200710080709-7ca71cdb9383
yunion.io/x/log v0.0.0-20200313080802-57a4ce5966b3
yunion.io/x/onecloud v0.0.0-20200803085840-138088027e60
yunion.io/x/onecloud v0.0.0-20200804055117-525a18dde239
yunion.io/x/onecloud-operator v0.0.2-0.20200804035104-698c93ae75f0
yunion.io/x/pkg v0.0.0-20200713121502-18154120c49b
)
Expand All @@ -74,7 +74,7 @@ replace (
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.15.8
k8s.io/kubectl => k8s.io/kubectl v0.15.9-beta.0
k8s.io/kubelet => k8s.io/kubelet v0.15.8
k8s.io/kubernetes => k8s.io/kubernetes v1.15.8
k8s.io/kubernetes => github.com/zexi/kubernetes v1.15.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.15.8
k8s.io/metrics => k8s.io/metrics v0.15.8
k8s.io/node-api => k8s.io/node-api v0.15.8
Expand Down
54 changes: 4 additions & 50 deletions go.sum

Large diffs are not rendered by default.

202 changes: 0 additions & 202 deletions vendor/github.com/coreos/etcd/LICENSE

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/coreos/etcd/NOTICE

This file was deleted.

Loading

0 comments on commit 774b517

Please sign in to comment.