Merge pull request #91014 from cici37/apiConfig

Move cmd/controller-manager to k8s.io/controller-manager

Kubernetes-commit: 1dff024e6449a98b6558c242b09e10f98efdb5ce

Godeps/Godeps.json

@@ -76,11 +76,11 @@
 		},
 		{
 			"ImportPath": "github.com/PuerkitoBio/purell",
-			"Rev": "v1.0.0"
+			"Rev": "v1.1.1"
 		},
 		{
 			"ImportPath": "github.com/PuerkitoBio/urlesc",
-			"Rev": "5bd2802263f2"
+			"Rev": "de5bf2ad4578"
 		},
 		{
 			"ImportPath": "github.com/alecthomas/template",
@@ -94,6 +94,10 @@
 			"ImportPath": "github.com/beorn7/perks",
 			"Rev": "v1.0.1"
 		},
+		{
+			"ImportPath": "github.com/bgentry/speakeasy",
+			"Rev": "v0.1.0"
+		},
 		{
 			"ImportPath": "github.com/blang/semver",
 			"Rev": "v3.5.0"
@@ -122,6 +126,30 @@
 			"ImportPath": "github.com/client9/misspell",
 			"Rev": "v0.3.4"
 		},
+		{
+			"ImportPath": "github.com/cockroachdb/datadriven",
+			"Rev": "80d97fb3cbaa"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc",
+			"Rev": "v2.1.0"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-semver",
+			"Rev": "v0.3.0"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-systemd",
+			"Rev": "95778dfbb74e"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg",
+			"Rev": "399ea9e2e55f"
+		},
+		{
+			"ImportPath": "github.com/creack/pty",
+			"Rev": "v1.1.7"
+		},
 		{
 			"ImportPath": "github.com/davecgh/go-spew",
 			"Rev": "v1.1.1"
@@ -138,13 +166,17 @@
 			"ImportPath": "github.com/docopt/docopt-go",
 			"Rev": "ee0de3bc6815"
 		},
+		{
+			"ImportPath": "github.com/dustin/go-humanize",
+			"Rev": "v1.0.0"
+		},
 		{
 			"ImportPath": "github.com/elazarl/goproxy",
 			"Rev": "947c36da3153"
 		},
 		{
 			"ImportPath": "github.com/emicklei/go-restful",
-			"Rev": "ff4f55a20633"
+			"Rev": "v2.9.5"
 		},
 		{
 			"ImportPath": "github.com/envoyproxy/go-control-plane",
@@ -158,13 +190,17 @@
 			"ImportPath": "github.com/evanphx/json-patch",
 			"Rev": "v4.9.0"
 		},
+		{
+			"ImportPath": "github.com/fatih/color",
+			"Rev": "v1.7.0"
+		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
 			"Rev": "v1.4.9"
 		},
 		{
 			"ImportPath": "github.com/ghodss/yaml",
-			"Rev": "73d445a93680"
+			"Rev": "v1.0.0"
 		},
 		{
 			"ImportPath": "github.com/go-gl/glfw/v3.3/glfw",
@@ -184,19 +220,19 @@
 		},
 		{
 			"ImportPath": "github.com/go-openapi/jsonpointer",
-			"Rev": "46af16f9f7b1"
+			"Rev": "v0.19.3"
 		},
 		{
 			"ImportPath": "github.com/go-openapi/jsonreference",
-			"Rev": "13c6e3589ad9"
+			"Rev": "v0.19.3"
 		},
 		{
 			"ImportPath": "github.com/go-openapi/spec",
-			"Rev": "6aced65f8501"
+			"Rev": "v0.19.3"
 		},
 		{
 			"ImportPath": "github.com/go-openapi/swag",
-			"Rev": "1d0bd113de87"
+			"Rev": "v0.19.5"
 		},
 		{
 			"ImportPath": "github.com/go-stack/stack",
@@ -258,10 +294,26 @@
 			"ImportPath": "github.com/googleapis/gnostic",
 			"Rev": "v0.4.1"
 		},
+		{
+			"ImportPath": "github.com/gorilla/websocket",
+			"Rev": "v1.4.0"
+		},
 		{
 			"ImportPath": "github.com/gregjones/httpcache",
 			"Rev": "9cad4c3443a7"
 		},
+		{
+			"ImportPath": "github.com/grpc-ecosystem/go-grpc-middleware",
+			"Rev": "f849b5445de4"
+		},
+		{
+			"ImportPath": "github.com/grpc-ecosystem/go-grpc-prometheus",
+			"Rev": "v1.2.0"
+		},
+		{
+			"ImportPath": "github.com/grpc-ecosystem/grpc-gateway",
+			"Rev": "v1.9.5"
+		},
 		{
 			"ImportPath": "github.com/hashicorp/golang-lru",
 			"Rev": "v0.5.1"
@@ -278,6 +330,14 @@
 			"ImportPath": "github.com/imdario/mergo",
 			"Rev": "v0.3.5"
 		},
+		{
+			"ImportPath": "github.com/inconshreveable/mousetrap",
+			"Rev": "v1.0.0"
+		},
+		{
+			"ImportPath": "github.com/jonboulle/clockwork",
+			"Rev": "v0.1.0"
+		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
 			"Rev": "v1.1.10"
@@ -312,7 +372,7 @@
 		},
 		{
 			"ImportPath": "github.com/kr/pty",
-			"Rev": "v1.1.1"
+			"Rev": "v1.1.5"
 		},
 		{
 			"ImportPath": "github.com/kr/text",
@@ -320,7 +380,19 @@
 		},
 		{
 			"ImportPath": "github.com/mailru/easyjson",
-			"Rev": "d5b7844b561a"
+			"Rev": "v0.7.0"
+		},
+		{
+			"ImportPath": "github.com/mattn/go-colorable",
+			"Rev": "v0.0.9"
+		},
+		{
+			"ImportPath": "github.com/mattn/go-isatty",
+			"Rev": "v0.0.4"
+		},
+		{
+			"ImportPath": "github.com/mattn/go-runewidth",
+			"Rev": "v0.0.2"
 		},
 		{
 			"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
@@ -340,7 +412,7 @@
 		},
 		{
 			"ImportPath": "github.com/munnerz/goautoneg",
-			"Rev": "a547fc61f48d"
+			"Rev": "a7dc8b61c822"
 		},
 		{
 			"ImportPath": "github.com/mwitkow/go-conntrack",
@@ -350,6 +422,10 @@
 			"ImportPath": "github.com/mxk/go-flowrate",
 			"Rev": "cca7078d478f"
 		},
+		{
+			"ImportPath": "github.com/olekukonko/tablewriter",
+			"Rev": "a0225b3f23b5"
+		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo",
 			"Rev": "v1.11.0"
@@ -370,6 +446,10 @@
 			"ImportPath": "github.com/pmezard/go-difflib",
 			"Rev": "v1.0.0"
 		},
+		{
+			"ImportPath": "github.com/pquerna/cachecontrol",
+			"Rev": "0dec1b30a021"
+		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang",
 			"Rev": "v1.7.1"
@@ -386,6 +466,10 @@
 			"ImportPath": "github.com/prometheus/procfs",
 			"Rev": "v0.1.3"
 		},
+		{
+			"ImportPath": "github.com/rogpeppe/fastuuid",
+			"Rev": "6724a57986af"
+		},
 		{
 			"ImportPath": "github.com/rogpeppe/go-internal",
 			"Rev": "v1.3.0"
@@ -394,22 +478,50 @@
 			"ImportPath": "github.com/sirupsen/logrus",
 			"Rev": "v1.6.0"
 		},
+		{
+			"ImportPath": "github.com/soheilhy/cmux",
+			"Rev": "v0.1.4"
+		},
 		{
 			"ImportPath": "github.com/spf13/afero",
 			"Rev": "v1.2.2"
 		},
+		{
+			"ImportPath": "github.com/spf13/cobra",
+			"Rev": "v0.0.3"
+		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
 			"Rev": "v1.0.5"
 		},
 		{
 			"ImportPath": "github.com/stretchr/objx",
-			"Rev": "v0.1.1"
+			"Rev": "v0.2.0"
 		},
 		{
 			"ImportPath": "github.com/stretchr/testify",
 			"Rev": "v1.4.0"
 		},
+		{
+			"ImportPath": "github.com/tmc/grpc-websocket-proxy",
+			"Rev": "0ad062ec5ee5"
+		},
+		{
+			"ImportPath": "github.com/urfave/cli",
+			"Rev": "v1.20.0"
+		},
+		{
+			"ImportPath": "github.com/xiang90/probing",
+			"Rev": "43a291ad63a2"
+		},
+		{
+			"ImportPath": "go.etcd.io/bbolt",
+			"Rev": "v1.3.5"
+		},
+		{
+			"ImportPath": "go.etcd.io/etcd",
+			"Rev": "dd1b699fc489"
+		},
 		{
 			"ImportPath": "go.opencensus.io",
 			"Rev": "v0.22.2"
@@ -510,6 +622,10 @@
 			"ImportPath": "gopkg.in/check.v1",
 			"Rev": "41f04d3bba15"
 		},
+		{
+			"ImportPath": "gopkg.in/cheggaaa/pb.v1",
+			"Rev": "v1.0.25"
+		},
 		{
 			"ImportPath": "gopkg.in/errgo.v2",
 			"Rev": "v2.1.0"
@@ -522,6 +638,18 @@
 			"ImportPath": "gopkg.in/inf.v0",
 			"Rev": "v0.9.1"
 		},
+		{
+			"ImportPath": "gopkg.in/natefinch/lumberjack.v2",
+			"Rev": "v2.0.0"
+		},
+		{
+			"ImportPath": "gopkg.in/resty.v1",
+			"Rev": "v1.12.0"
+		},
+		{
+			"ImportPath": "gopkg.in/square/go-jose.v2",
+			"Rev": "v2.2.2"
+		},
 		{
 			"ImportPath": "gopkg.in/tomb.v1",
 			"Rev": "dd632973f1e7"
@@ -544,20 +672,32 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "18112a7b933b"
+			"Rev": "2c3c141c931c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "10b38829b621"
+			"Rev": "d4f471b82f0a"
+		},
+		{
+			"ImportPath": "k8s.io/apiserver",
+			"Rev": "8dc797154823"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "758467711e07"
+			"Rev": "5682372f3538"
+		},
+		{
+			"ImportPath": "k8s.io/cloud-provider",
+			"Rev": "65ffae1dca41"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
 			"Rev": "609bde980a40"
 		},
+		{
+			"ImportPath": "k8s.io/controller-manager",
+			"Rev": "a314999e2f3c"
+		},
 		{
 			"ImportPath": "k8s.io/gengo",
 			"Rev": "3a45101e95ac"
@@ -578,6 +718,10 @@
 			"ImportPath": "rsc.io/binaryregexp",
 			"Rev": "v0.2.0"
 		},
+		{
+			"ImportPath": "sigs.k8s.io/apiserver-network-proxy/konnectivity-client",
+			"Rev": "v0.0.12"
+		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
 			"Rev": "b3cf1e8ff931"

go.mod

@@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
 go 1.15
 
 require (
-	k8s.io/apimachinery v0.0.0
+	k8s.io/apimachinery v0.0.0-20201006035708-d4f471b82f0a
-	k8s.io/cloud-provider v0.0.0
+	k8s.io/cloud-provider v0.0.0-20201020112754-65ffae1dca41
-	k8s.io/controller-manager v0.0.0
+	k8s.io/controller-manager v0.0.0-20201020112634-a314999e2f3c
 )
 
 replace (
-	k8s.io/api => ../api
+	k8s.io/api => k8s.io/api v0.0.0-20201005155906-2c3c141c931c
-	k8s.io/apimachinery => ../apimachinery
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201006035708-d4f471b82f0a
-	k8s.io/apiserver => ../apiserver
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201004000915-8dc797154823
-	k8s.io/client-go => ../client-go
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20201007120136-5682372f3538
-	k8s.io/cloud-provider => ../cloud-provider
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201020112754-65ffae1dca41
-	k8s.io/component-base => ../component-base
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20201004000625-609bde980a40
-	k8s.io/controller-manager => ../controller-manager
+	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201020112634-a314999e2f3c
-	k8s.io/kube-controller-manager => ../kube-controller-manager
 )

go.sum

@@ -424,6 +424,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-20201005155906-2c3c141c931c/go.mod h1:aE9OxkIvJAf55JfJy/0UlrF0nZT2ZDhmsWnNzhbAySI=
+k8s.io/apimachinery v0.0.0-20201006035708-d4f471b82f0a/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
+k8s.io/apiserver v0.0.0-20201004000915-8dc797154823/go.mod h1:pWzZ7B2/x/LnXrG3DCq0sbyJid61MPRGzilCg0P6ehQ=
+k8s.io/client-go v0.0.0-20201007120136-5682372f3538/go.mod h1:QvSrA3Tta0gMhxbrDVuu/Nf+5+qRalN2AXEQPQpgLPQ=
+k8s.io/cloud-provider v0.0.0-20201020112754-65ffae1dca41/go.mod h1:wFTVVvT9V1TJvB8ObKM/IbRSvqyLA2QuzWZjqr0SAFg=
+k8s.io/component-base v0.0.0-20201004000625-609bde980a40/go.mod h1:WUOeHeahPXuwTMTTZxsAJUyXuIRVbvgNTCVvlzwewJU=
+k8s.io/controller-manager v0.0.0-20201020112634-a314999e2f3c/go.mod h1:Vr9ghXOEQ4sX31BRjE6VI4EZQoJhKu8TkGcEYt7rjKA=
 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=