Merge pull request #82809 from liggitt/go-1.13-no-modules
update to use go1.13.4 Kubernetes-commit: 695c3061dd92a6b6950f8adf0341ceb4a8dd44d7
This commit is contained in:
		
							parent
							
								
									12b254d1c9
								
							
						
					
					
						commit
						1ff272f3f7
					
				| 
						 | 
					@ -160,7 +160,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/go-openapi/jsonpointer",
 | 
								"ImportPath": "github.com/go-openapi/jsonpointer",
 | 
				
			||||||
			"Rev": "v0.19.2"
 | 
								"Rev": "v0.19.3"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/go-openapi/jsonreference",
 | 
								"ImportPath": "github.com/go-openapi/jsonreference",
 | 
				
			||||||
| 
						 | 
					@ -172,7 +172,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/go-openapi/swag",
 | 
								"ImportPath": "github.com/go-openapi/swag",
 | 
				
			||||||
			"Rev": "v0.19.2"
 | 
								"Rev": "v0.19.5"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/go-stack/stack",
 | 
								"ImportPath": "github.com/go-stack/stack",
 | 
				
			||||||
| 
						 | 
					@ -240,7 +240,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/gregjones/httpcache",
 | 
								"ImportPath": "github.com/gregjones/httpcache",
 | 
				
			||||||
			"Rev": "787624de3eb7"
 | 
								"Rev": "9cad4c3443a7"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/grpc-ecosystem/go-grpc-middleware",
 | 
								"ImportPath": "github.com/grpc-ecosystem/go-grpc-middleware",
 | 
				
			||||||
| 
						 | 
					@ -316,7 +316,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/mailru/easyjson",
 | 
								"ImportPath": "github.com/mailru/easyjson",
 | 
				
			||||||
			"Rev": "94de47d64c63"
 | 
								"Rev": "b2ccc519800e"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/mattn/go-colorable",
 | 
								"ImportPath": "github.com/mattn/go-colorable",
 | 
				
			||||||
| 
						 | 
					@ -372,7 +372,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/pkg/errors",
 | 
								"ImportPath": "github.com/pkg/errors",
 | 
				
			||||||
			"Rev": "v0.8.0"
 | 
								"Rev": "v0.8.1"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/pmezard/go-difflib",
 | 
								"ImportPath": "github.com/pmezard/go-difflib",
 | 
				
			||||||
| 
						 | 
					@ -420,7 +420,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/spf13/pflag",
 | 
								"ImportPath": "github.com/spf13/pflag",
 | 
				
			||||||
			"Rev": "v1.0.3"
 | 
								"Rev": "v1.0.5"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "github.com/stretchr/objx",
 | 
								"ImportPath": "github.com/stretchr/objx",
 | 
				
			||||||
| 
						 | 
					@ -468,7 +468,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/crypto",
 | 
								"ImportPath": "golang.org/x/crypto",
 | 
				
			||||||
			"Rev": "e84da0312774"
 | 
								"Rev": "60c769a6c586"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/exp",
 | 
								"ImportPath": "golang.org/x/exp",
 | 
				
			||||||
| 
						 | 
					@ -476,35 +476,39 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/lint",
 | 
								"ImportPath": "golang.org/x/lint",
 | 
				
			||||||
			"Rev": "8f45f776aaf1"
 | 
								"Rev": "d0100b6bd8b3"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/net",
 | 
								"ImportPath": "golang.org/x/net",
 | 
				
			||||||
			"Rev": "cdfb69ac37fc"
 | 
								"Rev": "13f9640d40b9"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/oauth2",
 | 
								"ImportPath": "golang.org/x/oauth2",
 | 
				
			||||||
			"Rev": "9f3314589c9a"
 | 
								"Rev": "0f29369cfe45"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/sync",
 | 
								"ImportPath": "golang.org/x/sync",
 | 
				
			||||||
			"Rev": "42b317875d0f"
 | 
								"Rev": "112230192c58"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/sys",
 | 
								"ImportPath": "golang.org/x/sys",
 | 
				
			||||||
			"Rev": "3b5209105503"
 | 
								"Rev": "fde4db37ae7a"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/text",
 | 
								"ImportPath": "golang.org/x/text",
 | 
				
			||||||
			"Rev": "e6919f6577db"
 | 
								"Rev": "v0.3.2"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/time",
 | 
								"ImportPath": "golang.org/x/time",
 | 
				
			||||||
			"Rev": "f51c12702a4d"
 | 
								"Rev": "9d24e82272b4"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "golang.org/x/tools",
 | 
								"ImportPath": "golang.org/x/tools",
 | 
				
			||||||
			"Rev": "5aca471b1d59"
 | 
								"Rev": "65e3620a7ae7"
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"ImportPath": "golang.org/x/xerrors",
 | 
				
			||||||
 | 
								"Rev": "a985d3407aa7"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "google.golang.org/api",
 | 
								"ImportPath": "google.golang.org/api",
 | 
				
			||||||
| 
						 | 
					@ -540,7 +544,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "gopkg.in/inf.v0",
 | 
								"ImportPath": "gopkg.in/inf.v0",
 | 
				
			||||||
			"Rev": "v0.9.0"
 | 
								"Rev": "v0.9.1"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "gopkg.in/natefinch/lumberjack.v2",
 | 
								"ImportPath": "gopkg.in/natefinch/lumberjack.v2",
 | 
				
			||||||
| 
						 | 
					@ -572,19 +576,19 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/api",
 | 
								"ImportPath": "k8s.io/api",
 | 
				
			||||||
			"Rev": "25240d7d6d90"
 | 
								"Rev": "665c8a257c1a"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/apimachinery",
 | 
								"ImportPath": "k8s.io/apimachinery",
 | 
				
			||||||
			"Rev": "00d39968b57e"
 | 
								"Rev": "52af7e4fbc87"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/client-go",
 | 
								"ImportPath": "k8s.io/client-go",
 | 
				
			||||||
			"Rev": "52092c3c67fa"
 | 
								"Rev": "6f1579c35d23"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/component-base",
 | 
								"ImportPath": "k8s.io/component-base",
 | 
				
			||||||
			"Rev": "1d7e08732f45"
 | 
								"Rev": "aea44d161014"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/gengo",
 | 
								"ImportPath": "k8s.io/gengo",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										17
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										17
									
								
								go.mod
								
								
								
								
							| 
						 | 
					@ -42,10 +42,10 @@ require (
 | 
				
			||||||
	gopkg.in/square/go-jose.v2 v2.2.2
 | 
						gopkg.in/square/go-jose.v2 v2.2.2
 | 
				
			||||||
	gopkg.in/yaml.v2 v2.2.4
 | 
						gopkg.in/yaml.v2 v2.2.4
 | 
				
			||||||
	gotest.tools v2.2.0+incompatible // indirect
 | 
						gotest.tools v2.2.0+incompatible // indirect
 | 
				
			||||||
	k8s.io/api v0.0.0
 | 
						k8s.io/api v0.0.0-20191107030003-665c8a257c1a
 | 
				
			||||||
	k8s.io/apimachinery v0.0.0
 | 
						k8s.io/apimachinery v0.0.0-20191107025710-52af7e4fbc87
 | 
				
			||||||
	k8s.io/client-go v0.0.0
 | 
						k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23
 | 
				
			||||||
	k8s.io/component-base v0.0.0
 | 
						k8s.io/component-base v0.0.0-20191107031042-aea44d161014
 | 
				
			||||||
	k8s.io/klog v1.0.0
 | 
						k8s.io/klog v1.0.0
 | 
				
			||||||
	k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
 | 
						k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
 | 
				
			||||||
	k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
 | 
						k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
 | 
				
			||||||
| 
						 | 
					@ -56,9 +56,8 @@ require (
 | 
				
			||||||
replace (
 | 
					replace (
 | 
				
			||||||
	golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
 | 
						golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
 | 
				
			||||||
	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
 | 
						golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
 | 
				
			||||||
	k8s.io/api => ../api
 | 
						k8s.io/api => k8s.io/api v0.0.0-20191107030003-665c8a257c1a
 | 
				
			||||||
	k8s.io/apimachinery => ../apimachinery
 | 
						k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191107025710-52af7e4fbc87
 | 
				
			||||||
	k8s.io/apiserver => ../apiserver
 | 
						k8s.io/client-go => k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23
 | 
				
			||||||
	k8s.io/client-go => ../client-go
 | 
						k8s.io/component-base => k8s.io/component-base v0.0.0-20191107031042-aea44d161014
 | 
				
			||||||
	k8s.io/component-base => ../component-base
 | 
					 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										4
									
								
								go.sum
								
								
								
								
							| 
						 | 
					@ -346,6 +346,10 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
 | 
				
			||||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
					honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
				
			||||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
					honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
				
			||||||
 | 
					k8s.io/api v0.0.0-20191107030003-665c8a257c1a/go.mod h1:gBpbNJH4JlHuCXtSTkFwvuGtM+dvyfLKuFOTt1WtKAM=
 | 
				
			||||||
 | 
					k8s.io/apimachinery v0.0.0-20191107025710-52af7e4fbc87/go.mod h1:DJOb3m0kw91A0YaUsaoYChi4d7xVF84HLiuRCxGsV04=
 | 
				
			||||||
 | 
					k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23/go.mod h1:r4ENSfZ8DK7J8mJZMtvlUa7g9SGuvAkRS1IsMEK+sgY=
 | 
				
			||||||
 | 
					k8s.io/component-base v0.0.0-20191107031042-aea44d161014/go.mod h1:HrBDYnayl4WAKY3sdBIZNjeMk0wV4rQ1e2bmSiNVJyQ=
 | 
				
			||||||
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 | 
					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.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 | 
				
			||||||
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 | 
					k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue