move reststorage providers to their correct packages

pkg/master/thirdparty_controller.go

@@ -17,21 +17,10 @@ limitations under the License.
 package master
 
 import (
-	"fmt"
-	"strings"
-
-	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	expapi "k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/apiserver"
-	thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/etcd"
-	"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
-	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/util/sets"
 )
 
-const thirdpartyprefix = "/apis"
-
 // dynamicLister is used to list resources for dynamic third party
 // apis. It implements the apiserver.APIResourceLister interface
 type dynamicLister struct {
@@ -44,103 +33,3 @@ func (d dynamicLister) ListAPIResources() []unversioned.APIResource {
 }
 
 var _ apiserver.APIResourceLister = &dynamicLister{}
-
-func makeThirdPartyPath(group string) string {
-	if len(group) == 0 {
-		return thirdpartyprefix
-	}
-	return thirdpartyprefix + "/" + group
-}
-
-func getThirdPartyGroupName(path string) string {
-	return strings.TrimPrefix(strings.TrimPrefix(path, thirdpartyprefix), "/")
-}
-
-// resourceInterface is the interface for the parts of the master that know how to add/remove
-// third party resources.  Extracted into an interface for injection for testing.
-type resourceInterface interface {
-	// Remove a third party resource based on the RESTful path for that resource, the path is <api-group-path>/<resource-plural-name>
-	RemoveThirdPartyResource(path string) error
-	// Install a third party resource described by 'rsrc'
-	InstallThirdPartyResource(rsrc *expapi.ThirdPartyResource) error
-	// Is a particular third party resource currently installed?
-	HasThirdPartyResource(rsrc *expapi.ThirdPartyResource) (bool, error)
-	// List all currently installed third party resources, the returned
-	// names are of the form <api-group-path>/<resource-plural-name>
-	ListThirdPartyResources() []string
-}
-
-// ThirdPartyController is a control loop that knows how to synchronize ThirdPartyResource objects with
-// RESTful resources which are present in the API server.
-type ThirdPartyController struct {
-	master                     resourceInterface
-	thirdPartyResourceRegistry *thirdpartyresourceetcd.REST
-}
-
-// Synchronize a single resource with RESTful resources on the master
-func (t *ThirdPartyController) SyncOneResource(rsrc *expapi.ThirdPartyResource) error {
-	// TODO: we also need to test if the existing installed resource matches the resource we are sync-ing.
-	// Currently, if there is an older, incompatible resource installed, we won't remove it.  We should detect
-	// older, incompatible resources and remove them before testing if the resource exists.
-	hasResource, err := t.master.HasThirdPartyResource(rsrc)
-	if err != nil {
-		return err
-	}
-	if !hasResource {
-		return t.master.InstallThirdPartyResource(rsrc)
-	}
-	return nil
-}
-
-// Synchronize all resources with RESTful resources on the master
-func (t *ThirdPartyController) SyncResources() error {
-	list, err := t.thirdPartyResourceRegistry.List(api.NewDefaultContext(), nil)
-	if err != nil {
-		return err
-	}
-	return t.syncResourceList(list)
-}
-
-func (t *ThirdPartyController) syncResourceList(list runtime.Object) error {
-	existing := sets.String{}
-	switch list := list.(type) {
-	case *expapi.ThirdPartyResourceList:
-		// Loop across all schema objects for third party resources
-		for ix := range list.Items {
-			item := &list.Items[ix]
-			// extract the api group and resource kind from the schema
-			_, group, err := thirdpartyresourcedata.ExtractApiGroupAndKind(item)
-			if err != nil {
-				return err
-			}
-			// place it in the set of resources that we expect, so that we don't delete it in the delete pass
-			existing.Insert(makeThirdPartyPath(group))
-			// ensure a RESTful resource for this schema exists on the master
-			if err := t.SyncOneResource(item); err != nil {
-				return err
-			}
-		}
-	default:
-		return fmt.Errorf("expected a *ThirdPartyResourceList, got %#v", list)
-	}
-	// deletion phase, get all installed RESTful resources
-	installed := t.master.ListThirdPartyResources()
-	for _, installedAPI := range installed {
-		found := false
-		// search across the expected restful resources to see if this resource belongs to one of the expected ones
-		for _, apiPath := range existing.List() {
-			if installedAPI == apiPath || strings.HasPrefix(installedAPI, apiPath+"/") {
-				found = true
-				break
-			}
-		}
-		// not expected, delete the resource
-		if !found {
-			if err := t.master.RemoveThirdPartyResource(installedAPI); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}