kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.16 

Kubernetes-commit: 8d7df36242af72fe3777e3710751f6b99ce23558
This commit is contained in:
Kubernetes Publisher 2019-08-23 12:10:56 +00:00
parent 350567f807
commit 0993dad316
3 changed files with 88 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Godeps/Godeps.json generated
View File

@ -6,6 +6,34 @@
"./..."
],
"Deps": [
{
"ImportPath": "cloud.google.com/go",
"Rev": "v0.34.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest",
"Rev": "v0.9.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest/adal",
"Rev": "v0.5.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest/date",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/autorest/mocks",
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/logger",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/Azure/go-autorest/tracing",
"Rev": "v0.5.0"
},
{
"ImportPath": "github.com/NYTimes/gziphandler",
"Rev": "56545f4a5d46"
@ -30,6 +58,10 @@
"ImportPath": "github.com/davecgh/go-spew",
"Rev": "v1.1.1"
},
{
"ImportPath": "github.com/dgrijalva/jwt-go",
"Rev": "v3.2.0"
},
{
"ImportPath": "github.com/docker/spdystream",
"Rev": "449fdfce4d96"
@ -86,6 +118,10 @@
"ImportPath": "github.com/golang/protobuf",
"Rev": "v1.2.0"
},
{
"ImportPath": "github.com/google/btree",
"Rev": "7d79101e329e"
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0"
@ -102,6 +138,14 @@
"ImportPath": "github.com/googleapis/gnostic",
"Rev": "0c5108395e2d"
},
{
"ImportPath": "github.com/gophercloud/gophercloud",
"Rev": "v0.1.0"
},
{
"ImportPath": "github.com/gregjones/httpcache",
"Rev": "787624de3eb7"
},
{
"ImportPath": "github.com/hashicorp/golang-lru",
"Rev": "v0.5.0"
@ -110,6 +154,10 @@
"ImportPath": "github.com/hpcloud/tail",
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.7"
@ -166,6 +214,10 @@
"ImportPath": "github.com/onsi/gomega",
"Rev": "v1.5.0"
},
{
"ImportPath": "github.com/peterbourgon/diskv",
"Rev": "v2.0.1"
},
{
"ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0"
@ -202,10 +254,18 @@
"ImportPath": "github.com/stretchr/testify",
"Rev": "v1.3.0"
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "e84da0312774"
},
{
"ImportPath": "golang.org/x/net",
"Rev": "cdfb69ac37fc"
},
{
"ImportPath": "golang.org/x/oauth2",
"Rev": "9f3314589c9a"
},
{
"ImportPath": "golang.org/x/sync",
"Rev": "42b317875d0f"
@ -218,10 +278,18 @@
"ImportPath": "golang.org/x/text",
"Rev": "e6919f6577db"
},
{
"ImportPath": "golang.org/x/time",
"Rev": "f51c12702a4d"
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "6c7e314b6563"
},
{
"ImportPath": "google.golang.org/appengine",
"Rev": "v1.5.0"
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "788fd7840127"
@ -242,13 +310,21 @@
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.2"
},
{
"ImportPath": "k8s.io/api",
"Rev": "3efd428ce51b"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "31b1e1ea64dc"
"Rev": "620c521aba34"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e0d2c14f19fa"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "74b38ad9c4f2"
"Rev": "73cfb6232c94"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190823121056-620c521aba34
k8s.io/component-base v0.0.0-20190826120455-73cfb6232c94
)
replace (
@ -14,9 +14,8 @@ replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20190820101204-3efd428ce51b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190823121056-620c521aba34
k8s.io/client-go => k8s.io/client-go v0.0.0-20190823121056-e0d2c14f19fa
k8s.io/component-base => k8s.io/component-base v0.0.0-20190826120455-73cfb6232c94
)

4
go.sum
View File

@ -119,6 +119,10 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190820101204-3efd428ce51b/go.mod h1:Qzk+0nJ70fr1C/s9u/hmb27VzsPJbMXp/85hMFbyuZ4=
k8s.io/apimachinery v0.0.0-20190823121056-620c521aba34/go.mod h1:EZoIMuAgG/4v58YL+bz0kqnivqupk28fKYxFCa5e6X8=
k8s.io/client-go v0.0.0-20190823121056-e0d2c14f19fa/go.mod h1:5rz5cy2vpy3NBQID6u9lvHf6RE8SzERTLyrTScNS/HI=
k8s.io/component-base v0.0.0-20190826120455-73cfb6232c94/go.mod h1:asZJDERGpMXKCdQ+S5odjuJQ/H/IxtO3SNWbMOPXBvg=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=