Merge pull request kubernetes-sigs#4 from DirectXMan12/refactor/update-deps-and-rename

Update Dependencies and Rename

Author: DirectXMan12

.gitignore

@@ -1,3 +1,4 @@
 *.swp
 *~
 sample-main
+vendor

README.md

@@ -12,8 +12,8 @@ implementation backed by fake data.
 ## How to use this repository
 
 In order to use this repository, you should vendor this repository at
-`k8s.io/custom-metrics-boilerplate`, and implement the
-`"k8s.io/custom-metrics-boilerplate/pkg/provider".CustomMetricsProvider`
+`github.com/directxman12/custom-metrics-boilerplate`, and implement the
+`"github.com/directxman12/custom-metrics-boilerplate/pkg/provider".CustomMetricsProvider`
 interface.  You can then pass this to the main setup functions.
 
 The `pkg/cmd` package contains the building blocks of the actual API

glide.lock

@@ -1,4 +1,4 @@
-package: k8s.io/custom-metrics-boilerplate
+package: github.com/directxman12/custom-metrics-boilerplate
 import:
 - package: github.com/emicklei/go-restful
 - package: github.com/spf13/cobra

glide.yaml

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/version"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 
-	"k8s.io/custom-metrics-boilerplate/pkg/provider"
+	"github.com/directxman12/custom-metrics-boilerplate/pkg/provider"
 	"k8s.io/metrics/pkg/apis/custom_metrics/install"
 )
 
@@ -88,7 +88,7 @@ func (c *Config) SkipComplete() completedConfig {
 
 // New returns a new instance of CustomMetricsAdapterServer from the given config.
 func (c completedConfig) New(cmProvider provider.CustomMetricsProvider) (*CustomMetricsAdapterServer, error) {
-	genericServer, err := c.Config.GenericConfig.SkipComplete().New() // completion is done in Complete, no need for a second time
+	genericServer, err := c.Config.GenericConfig.SkipComplete().New(genericapiserver.EmptyDelegate) // completion is done in Complete, no need for a second time
 	if err != nil {
 		return nil, err
 	}

pkg/apiserver/apiserver.go

@@ -23,10 +23,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	genericapi "k8s.io/apiserver/pkg/endpoints"
 	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/endpoints/discovery"
 
-	specificapi "k8s.io/custom-metrics-boilerplate/pkg/apiserver/installer"
-	"k8s.io/custom-metrics-boilerplate/pkg/provider"
-	metricstorage "k8s.io/custom-metrics-boilerplate/pkg/registry/custom_metrics"
+	specificapi "github.com/directxman12/custom-metrics-boilerplate/pkg/apiserver/installer"
+	"github.com/directxman12/custom-metrics-boilerplate/pkg/provider"
+	metricstorage "github.com/directxman12/custom-metrics-boilerplate/pkg/registry/custom_metrics"
 	"k8s.io/metrics/pkg/apis/custom_metrics"
 )
 
@@ -43,19 +44,19 @@ func (s *CustomMetricsAdapterServer) InstallCustomMetricsAPI() error {
 		Version:      groupMeta.GroupVersion.Version,
 	}
 	apiGroup := metav1.APIGroup{
-		Name:             groupMeta.GroupVersion.String(),
+		Name:             groupMeta.GroupVersion.Group,
 		Versions:         []metav1.GroupVersionForDiscovery{groupVersion},
 		PreferredVersion: preferredVersionForDiscovery,
 	}
 
 	cmAPI := s.cmAPI(groupMeta, &groupMeta.GroupVersion)
 
-	if err := cmAPI.InstallREST(s.GenericAPIServer.HandlerContainer.Container); err != nil {
+	if err := cmAPI.InstallREST(s.GenericAPIServer.Handler.GoRestfulContainer); err != nil {
 		return err
 	}
 
-	path := genericapiserver.APIGroupPrefix + "/" + groupMeta.GroupVersion.Group
-	s.GenericAPIServer.HandlerContainer.Add(genericapi.NewGroupWebService(s.GenericAPIServer.Serializer, path, apiGroup))
+	s.GenericAPIServer.DiscoveryGroupManager.AddGroup(apiGroup)
+	s.GenericAPIServer.Handler.GoRestfulContainer.Add(discovery.NewAPIGroupHandler(s.GenericAPIServer.Serializer, apiGroup).WebService())
 
 	return nil
 }

pkg/apiserver/cmapis.go

@@ -40,8 +40,8 @@ import (
 	"k8s.io/metrics/pkg/apis/custom_metrics"
 	cmv1alpha1 "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
 
-	"k8s.io/custom-metrics-boilerplate/pkg/provider"
-	metricstorage "k8s.io/custom-metrics-boilerplate/pkg/registry/custom_metrics"
+	"github.com/directxman12/custom-metrics-boilerplate/pkg/provider"
+	metricstorage "github.com/directxman12/custom-metrics-boilerplate/pkg/registry/custom_metrics"
 
 )