Remove resources that are not needed to run cluster capacity analysis.

Author: Avesh Agarwal

pkg/api/api.go

@@ -21,19 +21,13 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 )
 
 type ResourceType string
 
 const (
-	Pods                   ResourceType = "pods"
-	PersistentVolumes      ResourceType = "persistentvolumes"
-	ReplicationControllers ResourceType = "replicationcontrollers"
-	Nodes                  ResourceType = "nodes"
-	Services               ResourceType = "services"
-	PersistentVolumeClaims ResourceType = "persistentvolumeclaims"
-	ReplicaSets            ResourceType = "replicasets"
+	Pods  ResourceType = "pods"
+	Nodes ResourceType = "nodes"
 )
 
 func (r ResourceType) String() string {
@@ -44,18 +38,8 @@ func (r ResourceType) ObjectType() runtime.Object {
 	switch r {
 	case "pods":
 		return &v1.Pod{}
-	case "persistentvolumes":
-		return &v1.PersistentVolume{}
-	case "replicationcontrollers":
-		return &v1.ReplicationController{}
 	case "nodes":
 		return &v1.Node{}
-	case "services":
-		return &v1.Service{}
-	case "persistentvolumeclaims":
-		return &v1.PersistentVolumeClaim{}
-	case "replicasets":
-		return &v1beta1.ReplicaSet{}
 	}
 	return nil
 }
@@ -64,18 +48,8 @@ func StringToResourceType(resource string) (ResourceType, error) {
 	switch resource {
 	case "pods":
 		return Pods, nil
-	case "persistentvolumes":
-		return PersistentVolumes, nil
-	case "replicationcontrollers":
-		return ReplicationControllers, nil
 	case "nodes":
 		return Nodes, nil
-	case "services":
-		return Services, nil
-	case "persistentvolumeclaims":
-		return PersistentVolumeClaims, nil
-	case "replicasets":
-		return ReplicaSets, nil
 	default:
 		return "", fmt.Errorf("Resource type %v not recognized", resource)
 	}

pkg/framework/restclient/external/restclient.go

@@ -37,7 +37,6 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 
 	ccapi "github.com/kubernetes-incubator/cluster-capacity/pkg/api"
 	"github.com/kubernetes-incubator/cluster-capacity/pkg/framework/store"
@@ -124,80 +123,6 @@ func (c *RESTClient) Pods(fieldsSelector fields.Selector) *v1.PodList {
 	}
 }
 
-func (c *RESTClient) Services(fieldsSelector fields.Selector) *v1.ServiceList {
-	items := c.resourceStore.List(ccapi.Services)
-	typedItems := make([]v1.Service, 0, len(items))
-	for _, item := range items {
-		if !fieldsSelector.Matches(NewObjectFieldsAccessor(item)) {
-			continue
-		}
-		typedItems = append(typedItems, *item.(*v1.Service))
-	}
-
-	return &v1.ServiceList{
-		ListMeta: metav1.ListMeta{
-			// choose arbitrary value as the cache does not store the ResourceVersion
-			ResourceVersion: "0",
-		},
-		Items: typedItems,
-	}
-}
-
-func (c *RESTClient) ReplicationControllers(fieldsSelector fields.Selector) *v1.ReplicationControllerList {
-	items := c.resourceStore.List(ccapi.ReplicationControllers)
-	typedItems := make([]v1.ReplicationController, 0, len(items))
-	for _, item := range items {
-		if !fieldsSelector.Matches(NewObjectFieldsAccessor(item)) {
-			continue
-		}
-		typedItems = append(typedItems, *item.(*v1.ReplicationController))
-	}
-
-	return &v1.ReplicationControllerList{
-		ListMeta: metav1.ListMeta{
-			// choose arbitrary value as the cache does not store the ResourceVersion
-			ResourceVersion: "0",
-		},
-		Items: typedItems,
-	}
-}
-
-func (c *RESTClient) PersistentVolumes(fieldsSelector fields.Selector) *v1.PersistentVolumeList {
-	items := c.resourceStore.List(ccapi.PersistentVolumes)
-	typedItems := make([]v1.PersistentVolume, 0, len(items))
-	for _, item := range items {
-		if !fieldsSelector.Matches(NewObjectFieldsAccessor(item)) {
-			continue
-		}
-		typedItems = append(typedItems, *item.(*v1.PersistentVolume))
-	}
-
-	return &v1.PersistentVolumeList{
-		ListMeta: metav1.ListMeta{
-			ResourceVersion: "0",
-		},
-		Items: typedItems,
-	}
-}
-
-func (c *RESTClient) PersistentVolumeClaims(fieldsSelector fields.Selector) *v1.PersistentVolumeClaimList {
-	items := c.resourceStore.List(ccapi.PersistentVolumeClaims)
-	typedItems := make([]v1.PersistentVolumeClaim, 0, len(items))
-	for _, item := range items {
-		if !fieldsSelector.Matches(NewObjectFieldsAccessor(item)) {
-			continue
-		}
-		typedItems = append(typedItems, *item.(*v1.PersistentVolumeClaim))
-	}
-
-	return &v1.PersistentVolumeClaimList{
-		ListMeta: metav1.ListMeta{
-			ResourceVersion: "0",
-		},
-		Items: typedItems,
-	}
-}
-
 func (c *RESTClient) Nodes(fieldsSelector fields.Selector) *v1.NodeList {
 	items := c.resourceStore.List(ccapi.Nodes)
 	typedItems := make([]v1.Node, 0, len(items))
@@ -216,40 +141,12 @@ func (c *RESTClient) Nodes(fieldsSelector fields.Selector) *v1.NodeList {
 	}
 }
 
-func (c *RESTClient) ReplicaSets(fieldsSelector fields.Selector) *v1beta1.ReplicaSetList {
-	items := c.resourceStore.List(ccapi.ReplicaSets)
-	typedItems := make([]v1beta1.ReplicaSet, 0, len(items))
-	for _, item := range items {
-		if !fieldsSelector.Matches(NewObjectFieldsAccessor(item)) {
-			continue
-		}
-		typedItems = append(typedItems, *item.(*v1beta1.ReplicaSet))
-	}
-
-	return &v1beta1.ReplicaSetList{
-		ListMeta: metav1.ListMeta{
-			ResourceVersion: "0",
-		},
-		Items: typedItems,
-	}
-}
-
 func (c *RESTClient) List(resource ccapi.ResourceType, fieldsSelector fields.Selector) (runtime.Object, error) {
 	switch resource {
 	case ccapi.Pods:
 		return c.Pods(fieldsSelector), nil
-	case ccapi.Services:
-		return c.Services(fieldsSelector), nil
-	case ccapi.ReplicationControllers:
-		return c.ReplicationControllers(fieldsSelector), nil
-	case ccapi.PersistentVolumes:
-		return c.PersistentVolumes(fieldsSelector), nil
-	case ccapi.PersistentVolumeClaims:
-		return c.PersistentVolumeClaims(fieldsSelector), nil
 	case ccapi.Nodes:
 		return c.Nodes(fieldsSelector), nil
-	case ccapi.ReplicaSets:
-		return c.ReplicaSets(fieldsSelector), nil
 	default:
 		return nil, fmt.Errorf("Resource %s not recognized", resource)
 	}
@@ -327,13 +224,7 @@ func (c *RESTClient) request(verb string) *restclient.Request {
 	ns := c.NegotiatedSerializer
 	info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
 
-	var targetVersion schema.GroupVersion
-	if c.name == "extensions" {
-		gvr := schema.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "replicasets"}
-		targetVersion = gvr.GroupVersion()
-	} else {
-		targetVersion = gv
-	}
+	targetVersion := gv
 
 	serializers := restclient.Serializers{
 		Encoder: ns.EncoderForVersion(info.Serializer, gv),
@@ -364,9 +255,6 @@ func (c *RESTClient) createReadCloser(resource ccapi.ResourceType, obj runtime.O
 	}
 
 	gv := v1.SchemeGroupVersion
-	if resource == ccapi.ReplicaSets {
-		gv = schema.GroupVersion{Group: "extensions", Version: "v1beta1"}
-	}
 	encoder := api.Codecs.EncoderForVersion(info.Serializer, gv)
 	nopCloser := ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(encoder, obj))))
 	return &nopCloser, nil
@@ -404,23 +292,8 @@ func (c *RESTClient) createGetReadCloser(resource ccapi.ResourceType, resourceNa
 	case ccapi.Pods:
 		obj = runtime.Object(item.(*v1.Pod))
 		ns = item.(*v1.Pod).Namespace
-	case ccapi.Services:
-		obj = runtime.Object(item.(*v1.Service))
-		ns = item.(*v1.Service).Namespace
-	case ccapi.ReplicationControllers:
-		obj = runtime.Object(item.(*v1.ReplicationController))
-		ns = item.(*v1.ReplicationController).Namespace
-	case ccapi.PersistentVolumes:
-		obj = runtime.Object(item.(*v1.PersistentVolume))
-		ns = item.(*v1.PersistentVolume).Namespace
-	case ccapi.PersistentVolumeClaims:
-		obj = runtime.Object(item.(*v1.PersistentVolumeClaim))
-		ns = item.(*v1.PersistentVolumeClaim).Namespace
 	case ccapi.Nodes:
 		obj = runtime.Object(item.(*v1.Node))
-	case ccapi.ReplicaSets:
-		obj = runtime.Object(item.(*v1beta1.ReplicaSet))
-		ns = item.(*v1beta1.ReplicaSet).Namespace
 	default:
 		return nil, fmt.Errorf("Resource %v not recognized", resource)
 	}
@@ -459,30 +332,10 @@ func (c *RESTClient) createWatchReadCloser(resource ccapi.ResourceType, fieldsSe
 		for _, item := range c.Pods(fieldsSelector).Items {
 			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
 		}
-	case ccapi.Services:
-		for _, item := range c.Services(fieldsSelector).Items {
-			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
-		}
-	case ccapi.ReplicationControllers:
-		for _, item := range c.ReplicationControllers(fieldsSelector).Items {
-			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
-		}
-	case ccapi.PersistentVolumes:
-		for _, item := range c.PersistentVolumes(fieldsSelector).Items {
-			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
-		}
-	case ccapi.PersistentVolumeClaims:
-		for _, item := range c.PersistentVolumeClaims(fieldsSelector).Items {
-			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
-		}
 	case ccapi.Nodes:
 		for _, item := range c.Nodes(fieldsSelector).Items {
 			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
 		}
-	case ccapi.ReplicaSets:
-		for _, item := range c.ReplicaSets(fieldsSelector).Items {
-			rg.EmitWatchEvent(watch.Added, runtime.Object(&item))
-		}
 	default:
 		return nil, fmt.Errorf("Resource %s not recognized", resource)
 	}