Bump vendoring

Primary action was bumping the Kubernetes vendoring, other operations were to make it work. * Kubernetes to 1.16.2 * Removed `bitbucket.org/ww/goautoneg` as it is now included in Prometheus * Changed `serializer.DirectCodecFactory` to `serializer.WithoutConversionCodecFactory` in `api/client/clientset/typed/compose/*/compose_client.go` * Moved grpc to v1.23.1 * Ran `dep ensure -update sigs.k8s.io/structured-merge-diff` * Ran `dep ensure -update k8s.io/utils` Signed-off-by: Christopher Crone <[email protected]>
docker · Nov 7, 2019 · bbd07b4 · bbd07b4
1 parent 0e9cd2f
commit bbd07b4
Show file tree

Hide file tree

Showing 670 changed files with 137,617 additions and 48,121 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -24,23 +24,23 @@
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[constraint]]
   name = "k8s.io/apiserver"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[constraint]]
   name = "k8s.io/component-base"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[constraint]]
   name = "github.com/mitchellh/go-homedir"
@@ -62,12 +62,6 @@
   name = "github.com/Masterminds/semver"
   version = "v1.3.1"
 
-# Use GitHub mirror to not require Mercurial
-[[override]]
-  name = "bitbucket.org/ww/goautoneg"
-  source = "https://github.com/adjust/goautoneg"
-  revision = "d788f35a0315672bc90f50a6145d1252a230ee0d"
-
 # Transitive dependencies that cannot use tip version.
 [[override]]
   name = "github.com/xeipuuv/gojsonschema"
@@ -88,7 +82,7 @@
 
 [[override]]
   name = "google.golang.org/grpc"
-  version = "~v1.24.0"
+  version = "v1.23.1"
 
 [[override]]
   name = "github.com/ugorji/go"
@@ -100,19 +94,19 @@
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[override]]
   name = "k8s.io/kubernetes"
-  version = "v1.14.7"
+  version = "v1.16.2"
 
 [[override]]
   name = "k8s.io/kube-aggregator"
-  version = "kubernetes-1.14.7"
+  version = "kubernetes-1.16.2"
 
 [[override]]
   name = "k8s.io/kube-openapi"
-  revision = "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
+  revision = "0270cf2f1c1d995d34b36019a6f65d58e6e33ad4"
 
 [[override]]
   name = "github.com/evanphx/json-patch"

diff --git a/api/client/clientset/typed/compose/v1alpha3/compose_client.go b/api/client/clientset/typed/compose/v1alpha3/compose_client.go
@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
 	gv := v1alpha3.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
+	config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
 
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()

diff --git a/api/client/clientset/typed/compose/v1beta1/compose_client.go b/api/client/clientset/typed/compose/v1beta1/compose_client.go
@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
 	gv := v1beta1.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
+	config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
 
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()

diff --git a/api/client/clientset/typed/compose/v1beta2/compose_client.go b/api/client/clientset/typed/compose/v1beta2/compose_client.go
@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
 	gv := v1beta2.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
+	config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
 
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()

diff --git a/internal/registry/tableconvert_test.go b/internal/registry/tableconvert_test.go
@@ -81,7 +81,7 @@ func TestConvertTable(t *testing.T) {
 		{
 			name:          "not a stack",
 			object:        &metav1beta1.Table{},
-			expectedError: "unexpected object type *v1beta1.Table",
+			expectedError: "unexpected object type *v1.Table",
 		},
 		{
 			name:         "single-nospec-nostatus",

diff --git a/vendor/bitbucket.org/ww/goautoneg/autoneg.go b/vendor/bitbucket.org/ww/goautoneg/autoneg.go
diff --git a/vendor/github.com/blang/semver/LICENSE b/vendor/github.com/blang/semver/LICENSE
diff --git a/vendor/github.com/blang/semver/json.go b/vendor/github.com/blang/semver/json.go