Merge pull request #95740 from cici37/moveCCM
Move cloud-controller-manager to staging k8s.io/cloud-provider Kubernetes-commit: 4b65f70652849310ccaf443e480a9a3149c3b9dd
This commit is contained in:
Kubernetes Publisher
parent
a5e0b394fd
commit
20231af460
|
|
@ -74,6 +74,10 @@
|
|||
"ImportPath": "github.com/NYTimes/gziphandler",
|
||||
"Rev": "56545f4a5d46"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/OneOfOne/xxhash",
|
||||
"Rev": "v1.2.2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/PuerkitoBio/purell",
|
||||
"Rev": "v1.1.1"
|
||||
|
|
@ -90,6 +94,10 @@
|
|||
"ImportPath": "github.com/alecthomas/units",
|
||||
"Rev": "c3de453c63f4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/armon/consul-api",
|
||||
"Rev": "eb2c6b5be1b6"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/beorn7/perks",
|
||||
"Rev": "v1.0.1"
|
||||
|
|
@ -106,6 +114,10 @@
|
|||
"ImportPath": "github.com/census-instrumentation/opencensus-proto",
|
||||
"Rev": "v0.2.1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cespare/xxhash",
|
||||
"Rev": "v1.1.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cespare/xxhash/v2",
|
||||
"Rev": "v2.1.1"
|
||||
|
|
@ -130,6 +142,14 @@
|
|||
"ImportPath": "github.com/cockroachdb/datadriven",
|
||||
"Rev": "80d97fb3cbaa"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/coreos/bbolt",
|
||||
"Rev": "v1.3.2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/coreos/etcd",
|
||||
"Rev": "v3.3.10"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/coreos/go-oidc",
|
||||
"Rev": "v2.1.0"
|
||||
|
|
@ -146,6 +166,10 @@
|
|||
"ImportPath": "github.com/coreos/pkg",
|
||||
"Rev": "399ea9e2e55f"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cpuguy83/go-md2man/v2",
|
||||
"Rev": "v2.0.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/creack/pty",
|
||||
"Rev": "v1.1.7"
|
||||
|
|
@ -158,6 +182,10 @@
|
|||
"ImportPath": "github.com/dgrijalva/jwt-go",
|
||||
"Rev": "v3.2.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/dgryski/go-sip13",
|
||||
"Rev": "e10d5fee7954"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/spdystream",
|
||||
"Rev": "449fdfce4d96"
|
||||
|
|
@ -322,6 +350,10 @@
|
|||
"ImportPath": "github.com/hashicorp/golang-lru",
|
||||
"Rev": "v0.5.1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/hashicorp/hcl",
|
||||
"Rev": "v1.0.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/hpcloud/tail",
|
||||
"Rev": "v1.0.0"
|
||||
|
|
@ -382,6 +414,10 @@
|
|||
"ImportPath": "github.com/kr/text",
|
||||
"Rev": "v0.1.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/magiconair/properties",
|
||||
"Rev": "v1.8.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/mailru/easyjson",
|
||||
"Rev": "v0.7.0"
|
||||
|
|
@ -402,6 +438,14 @@
|
|||
"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
|
||||
"Rev": "c182affec369"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/mitchellh/go-homedir",
|
||||
"Rev": "v1.1.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/mitchellh/mapstructure",
|
||||
"Rev": "v1.1.2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/moby/term",
|
||||
"Rev": "672ec06f55cd"
|
||||
|
|
@ -426,6 +470,10 @@
|
|||
"ImportPath": "github.com/mxk/go-flowrate",
|
||||
"Rev": "cca7078d478f"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/oklog/ulid",
|
||||
"Rev": "v1.3.1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/olekukonko/tablewriter",
|
||||
"Rev": "a0225b3f23b5"
|
||||
|
|
@ -438,6 +486,10 @@
|
|||
"ImportPath": "github.com/onsi/gomega",
|
||||
"Rev": "v1.7.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/pelletier/go-toml",
|
||||
"Rev": "v1.2.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/peterbourgon/diskv",
|
||||
"Rev": "v2.0.1"
|
||||
|
|
@ -470,6 +522,10 @@
|
|||
"ImportPath": "github.com/prometheus/procfs",
|
||||
"Rev": "v0.1.3"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/prometheus/tsdb",
|
||||
"Rev": "v0.7.1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/rogpeppe/fastuuid",
|
||||
"Rev": "6724a57986af"
|
||||
|
|
@ -478,6 +534,14 @@
|
|||
"ImportPath": "github.com/rogpeppe/go-internal",
|
||||
"Rev": "v1.3.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/russross/blackfriday/v2",
|
||||
"Rev": "v2.0.1"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/shurcooL/sanitized_anchor_name",
|
||||
"Rev": "v1.0.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/sirupsen/logrus",
|
||||
"Rev": "v1.6.0"
|
||||
|
|
@ -486,18 +550,34 @@
|
|||
"ImportPath": "github.com/soheilhy/cmux",
|
||||
"Rev": "v0.1.4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spaolacci/murmur3",
|
||||
"Rev": "f09979ecbc72"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/afero",
|
||||
"Rev": "v1.2.2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/cast",
|
||||
"Rev": "v1.3.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/cobra",
|
||||
"Rev": "v0.0.3"
|
||||
"Rev": "v1.0.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/jwalterweatherman",
|
||||
"Rev": "v1.0.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/pflag",
|
||||
"Rev": "v1.0.5"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/spf13/viper",
|
||||
"Rev": "v1.4.0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/stretchr/objx",
|
||||
"Rev": "v0.2.0"
|
||||
|
|
@ -510,6 +590,10 @@
|
|||
"ImportPath": "github.com/tmc/grpc-websocket-proxy",
|
||||
"Rev": "0ad062ec5ee5"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/ugorji/go",
|
||||
"Rev": "v1.1.4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/urfave/cli",
|
||||
"Rev": "v1.20.0"
|
||||
|
|
@ -518,6 +602,10 @@
|
|||
"ImportPath": "github.com/xiang90/probing",
|
||||
"Rev": "43a291ad63a2"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/xordataexchange/crypt",
|
||||
"Rev": "b2862e3d0a77"
|
||||
},
|
||||
{
|
||||
"ImportPath": "go.etcd.io/bbolt",
|
||||
"Rev": "v1.3.5"
|
||||
|
|
@ -676,23 +764,23 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "54bcc311e327"
|
||||
"Rev": "4d8a081546cb"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
"Rev": "554eef9dbf66"
|
||||
"Rev": "d10b9c3a6d2e"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apiserver",
|
||||
"Rev": "2ae8708a5843"
|
||||
"Rev": "84dc8122e3e7"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "d1a4fe5f2d96"
|
||||
"Rev": "0c53f2fd3c33"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/cloud-provider",
|
||||
"Rev": "df56f09b96aa"
|
||||
"Rev": "78b38434f91a"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/component-base",
|
||||
|
|
@ -700,7 +788,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/controller-manager",
|
||||
"Rev": "ac32f7f238d7"
|
||||
"Rev": "38efdaab28ad"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/gengo",
|
||||
|
|
|
|||
21
go.mod
21
go.mod
|
|
@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
|
|||
go 1.15
|
||||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0
|
||||
k8s.io/cloud-provider v0.0.0
|
||||
k8s.io/controller-manager v0.0.0
|
||||
k8s.io/apimachinery v0.0.0-20201027202001-d10b9c3a6d2e
|
||||
k8s.io/cloud-provider v0.0.0-20201031004059-78b38434f91a
|
||||
k8s.io/controller-manager v0.0.0-20201030084002-38efdaab28ad
|
||||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => ../api
|
||||
k8s.io/apimachinery => ../apimachinery
|
||||
k8s.io/apiserver => ../apiserver
|
||||
k8s.io/client-go => ../client-go
|
||||
k8s.io/cloud-provider => ../cloud-provider
|
||||
k8s.io/component-base => ../component-base
|
||||
k8s.io/controller-manager => ../controller-manager
|
||||
k8s.io/kube-controller-manager => ../kube-controller-manager
|
||||
k8s.io/api => k8s.io/api v0.0.0-20201030042148-4d8a081546cb
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201027202001-d10b9c3a6d2e
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201030141406-84dc8122e3e7
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20201030042407-0c53f2fd3c33
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201031004059-78b38434f91a
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201030084002-38efdaab28ad
|
||||
)
|
||||
|
|
|
|||
7
go.sum
7
go.sum
|
|
@ -528,6 +528,13 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
k8s.io/api v0.0.0-20201030042148-4d8a081546cb/go.mod h1:cNY/tFihnYSIhuIdtw13PBhc93n4lCG6qO7w51VdJ1I=
|
||||
k8s.io/apimachinery v0.0.0-20201027202001-d10b9c3a6d2e/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
|
||||
k8s.io/apiserver v0.0.0-20201030141406-84dc8122e3e7/go.mod h1:5jn4+LSLD72Atn+lTD2HQ4HAXfkwXcjCcC0kuUaBhHw=
|
||||
k8s.io/client-go v0.0.0-20201030042407-0c53f2fd3c33/go.mod h1:O1wpED2x/HRMg8YeWLCeeZ6lc2vJcHtdl3Xkm6kPGJ0=
|
||||
k8s.io/cloud-provider v0.0.0-20201031004059-78b38434f91a/go.mod h1:+i35woumOEYwp9MEHIVr9fSXnFiSnF76o0iU4JNLkm8=
|
||||
k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8/go.mod h1:/qyqddjukzwbk9MFz10nyuHMur+ykWBpJ1oweb8IDNE=
|
||||
k8s.io/controller-manager v0.0.0-20201030084002-38efdaab28ad/go.mod h1:VY0CkdxRGwmOg4A7oVI+JUW+Pq4/KuEobzFLau2OX9s=
|
||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
|
||||
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
|
||||
|
|
|
|||
Loading…
Reference in New Issue