Merge pull request #13244 from jim-minter/move_pkg_template_registry

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/server/origin/master.go

@@ -92,8 +92,8 @@ import (
 	hostsubnetetcd "github.com/openshift/origin/pkg/sdn/registry/hostsubnet/etcd"
 	netnamespaceetcd "github.com/openshift/origin/pkg/sdn/registry/netnamespace/etcd"
 	saoauth "github.com/openshift/origin/pkg/serviceaccounts/oauthclient"
-	templateregistry "github.com/openshift/origin/pkg/template/registry"
-	templateetcd "github.com/openshift/origin/pkg/template/registry/etcd"
+	templateregistry "github.com/openshift/origin/pkg/template/registry/template"
+	templateetcd "github.com/openshift/origin/pkg/template/registry/template/etcd"
 	groupetcd "github.com/openshift/origin/pkg/user/registry/group/etcd"
 	identityregistry "github.com/openshift/origin/pkg/user/registry/identity"
 	identityetcd "github.com/openshift/origin/pkg/user/registry/identity/etcd"

pkg/template/registry/etcd/etcd.go renamed to pkg/template/registry/template/etcd/etcd.go

@@ -6,7 +6,7 @@ import (
 	"k8s.io/kubernetes/pkg/storage"
 
 	"github.com/openshift/origin/pkg/template/api"
-	tregistry "github.com/openshift/origin/pkg/template/registry"
+	"github.com/openshift/origin/pkg/template/registry/template"
 	"github.com/openshift/origin/pkg/util/restoptions"
 )
 
@@ -20,11 +20,11 @@ func NewREST(optsGetter restoptions.Getter) (*REST, error) {
 	store := &registry.Store{
 		NewFunc:           func() runtime.Object { return &api.Template{} },
 		NewListFunc:       func() runtime.Object { return &api.TemplateList{} },
-		PredicateFunc:     tregistry.Matcher,
+		PredicateFunc:     template.Matcher,
 		QualifiedResource: api.Resource("templates"),
 
-		CreateStrategy: tregistry.Strategy,
-		UpdateStrategy: tregistry.Strategy,
+		CreateStrategy: template.Strategy,
+		UpdateStrategy: template.Strategy,
 
 		ReturnDeletedObject: true,
 	}

pkg/template/registry/etcd/etcd_test.go renamed to pkg/template/registry/template/etcd/etcd_test.go

@@ -1,4 +1,4 @@
-package registry
+package template
 
 import (
 	"math/rand"

pkg/template/registry/rest.go renamed to pkg/template/registry/template/rest.go

@@ -1,4 +1,4 @@
-package registry
+package template
 
 import (
 	"testing"

pkg/template/registry/rest_test.go renamed to pkg/template/registry/template/rest_test.go

@@ -1,4 +1,4 @@
-package registry
+package template
 
 import (
 	"fmt"