Merge pull request kubernetes-sigs#16 from DirectXMan12/deps/release-1.10-rc

Update deps to k8s 1.10-rc.1

Author: DirectXMan12

glide.lock

@@ -1,10 +1,20 @@
 package: github.com/kubernetes-incubator/custom-metrics-apiserver
 import:
 - package: github.com/emicklei/go-restful
+  version: 2.2.1  # close to kubernetes Godeps.json
+
 - package: github.com/emicklei/go-restful-swagger12
+  version: 1.0.1  # from kubernetes Godeps.json
+
 - package: github.com/go-openapi/spec
+  version: 1de3e0542de65ad8d75452a595886fdd0befb363  # from kubernetes Godeps.json
+
 - package: github.com/golang/glog
+  version: 44145f04b68cf362d9c4df2182967c2275eaefed  # from kubernetes Godep.json
+
 - package: github.com/spf13/cobra
+  version: c439c4fa093711d42e1b01acb1235b52004753c1  # from kubernetes Godeps.json
+
 - package: k8s.io/apimachinery
   subpackages:
   - pkg/api/errors
@@ -23,6 +33,8 @@ import:
   - pkg/util/errors
   - pkg/util/wait
   - pkg/version
+  tag: kubernetes-1.10.0-rc.1
+
 - package: k8s.io/apiserver
   subpackages:
   - pkg/endpoints
@@ -35,6 +47,8 @@ import:
   - pkg/server
   - pkg/server/options
   - pkg/util/logs
+  tag: kubernetes-1.10.0-rc.1
+
 - package: k8s.io/client-go
   subpackages:
   - discovery
@@ -46,12 +60,16 @@ import:
   - rest
   - testing
   - tools/clientcmd
+  tag: kubernetes-1.10.0-rc.1
+
 - package: k8s.io/metrics
   subpackages:
   - pkg/apis/custom_metrics
   - pkg/apis/custom_metrics/install
   - pkg/apis/external_metrics
   - pkg/apis/external_metrics/install
+  tag: kubernetes-1.10.0-rc.1
+
 testImport:
 - package: github.com/stretchr/testify
   version: ^1.1.4

glide.yaml

@@ -75,13 +75,11 @@ func (s *CustomMetricsAdapterServer) cmAPI(groupMeta *apimachinery.GroupMeta, gr
 			Creater:         Scheme,
 			Convertor:       Scheme,
 			UnsafeConvertor: runtime.UnsafeObjectConvertor(Scheme),
-			Copier:          Scheme,
 			Typer:           Scheme,
 			Linker:          groupMeta.SelfLinker,
 			Mapper:          groupMeta.RESTMapper,
 
 			Context:                s.GenericAPIServer.RequestContextMapper(),
-			MinRequestTimeout:      s.GenericAPIServer.MinRequestTimeout(),
 			OptionsExternalVersion: &schema.GroupVersion{Version: "v1"},
 		},
 

pkg/apiserver/cmapis.go

@@ -76,13 +76,11 @@ func (s *CustomMetricsAdapterServer) emAPI(groupMeta *apimachinery.GroupMeta, gr
 			Creater:         Scheme,
 			Convertor:       Scheme,
 			UnsafeConvertor: runtime.UnsafeObjectConvertor(Scheme),
-			Copier:          Scheme,
 			Typer:           Scheme,
 			Linker:          groupMeta.SelfLinker,
 			Mapper:          groupMeta.RESTMapper,
 
 			Context:                s.GenericAPIServer.RequestContextMapper(),
-			MinRequestTimeout:      s.GenericAPIServer.MinRequestTimeout(),
 			OptionsExternalVersion: &schema.GroupVersion{Version: "v1"},
 		},
 		ResourceLister: provider.NewExternalMetricResourceLister(s.externalMetricsProvider),

pkg/apiserver/emapis.go

@@ -130,7 +130,6 @@ func handleCustomMetrics(prov provider.CustomMetricsProvider) http.Handler {
 			Creater:         Scheme,
 			Convertor:       Scheme,
 			UnsafeConvertor: runtime.UnsafeObjectConvertor(Scheme),
-			Copier:          Scheme,
 			Typer:           Scheme,
 			Linker:          customMetricsGroupMeta.SelfLinker,
 			Mapper:          customMetricsGroupMeta.RESTMapper,
@@ -170,7 +169,6 @@ func handleExternalMetrics(prov provider.ExternalMetricsProvider) http.Handler {
 			Creater:         Scheme,
 			Convertor:       Scheme,
 			UnsafeConvertor: runtime.UnsafeObjectConvertor(Scheme),
-			Copier:          Scheme,
 			Typer:           Scheme,
 			Linker:          externalMetricsGroupMeta.SelfLinker,
 			Mapper:          externalMetricsGroupMeta.RESTMapper,

pkg/apiserver/installer/apiserver_test.go

@@ -118,10 +118,11 @@ func (ch *CMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
 		ParameterCodec:  a.group.ParameterCodec,
 		Creater:         a.group.Creater,
 		Convertor:       a.group.Convertor,
-		Copier:          a.group.Copier,
 		Typer:           a.group.Typer,
 		UnsafeConvertor: a.group.UnsafeConvertor,
 
+		// TODO: support TableConvertor?
+
 		// TODO: This seems wrong for cross-group subresources. It makes an assumption that a subresource and its parent are in the same group version. Revisit this.
 		Resource:    a.group.GroupVersion.WithResource("*"),
 		Subresource: "*",

pkg/apiserver/installer/cmhandlers.go

@@ -98,10 +98,11 @@ func (ch *EMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
 		ParameterCodec:  a.group.ParameterCodec,
 		Creater:         a.group.Creater,
 		Convertor:       a.group.Convertor,
-		Copier:          a.group.Copier,
 		Typer:           a.group.Typer,
 		UnsafeConvertor: a.group.UnsafeConvertor,
 
+		// TODO: support TableConvertor?
+
 		// TODO: This seems wrong for cross-group subresources. It makes an assumption that a subresource and its parent are in the same group version. Revisit this.
 		Resource:    a.group.GroupVersion.WithResource("*"),
 		Subresource: "*",

pkg/apiserver/installer/emhandlers.go

@@ -66,14 +66,14 @@ func (o CustomMetricsAdapterServerOptions) Config() (*apiserver.Config, error) {
 	}
 
 	serverConfig := genericapiserver.NewConfig(apiserver.Codecs)
-	if err := o.SecureServing.ApplyTo(serverConfig); err != nil {
+	if err := o.SecureServing.ApplyTo(&serverConfig.SecureServing); err != nil {
 		return nil, err
 	}
 
-	if err := o.Authentication.ApplyTo(serverConfig); err != nil {
+	if err := o.Authentication.ApplyTo(&serverConfig.Authentication, serverConfig.SecureServing, nil); err != nil {
 		return nil, err
 	}
-	if err := o.Authorization.ApplyTo(serverConfig); err != nil {
+	if err := o.Authorization.ApplyTo(&serverConfig.Authorization); err != nil {
 		return nil, err
 	}