fed: mv pkg/typeadapters pkg/federatedtypes

federation/BUILD

@@ -27,9 +27,9 @@ filegroup(
         "//federation/cmd/kubefed:all-srcs",
         "//federation/develop:all-srcs",
         "//federation/pkg/dnsprovider:all-srcs",
+        "//federation/pkg/federatedtypes:all-srcs",
         "//federation/pkg/federation-controller:all-srcs",
         "//federation/pkg/kubefed:all-srcs",
-        "//federation/pkg/typeadapters:all-srcs",
         "//federation/registry/cluster:all-srcs",
     ],
     tags = ["automanaged"],

federation/cmd/federation-controller-manager/app/BUILD

@@ -22,6 +22,7 @@ go_library(
         "//federation/pkg/dnsprovider/providers/aws/route53:go_default_library",
         "//federation/pkg/dnsprovider/providers/coredns:go_default_library",
         "//federation/pkg/dnsprovider/providers/google/clouddns:go_default_library",
+        "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federation-controller/cluster:go_default_library",
         "//federation/pkg/federation-controller/configmap:go_default_library",
         "//federation/pkg/federation-controller/daemonset:go_default_library",
@@ -31,7 +32,6 @@ go_library(
         "//federation/pkg/federation-controller/replicaset:go_default_library",
         "//federation/pkg/federation-controller/secret:go_default_library",
         "//federation/pkg/federation-controller/service:go_default_library",
-        "//federation/pkg/typeadapters:go_default_library",
         "//pkg/util/configz:go_default_library",
         "//pkg/version:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",

federation/cmd/federation-controller-manager/app/controllermanager.go

@@ -36,6 +36,7 @@ import (
 	federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
 	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster"
 	configmapcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/configmap"
 	daemonsetcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/daemonset"
@@ -45,7 +46,6 @@ import (
 	replicasetcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/replicaset"
 	secretcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/secret"
 	servicecontroller "k8s.io/kubernetes/federation/pkg/federation-controller/service"
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
 	"k8s.io/kubernetes/pkg/util/configz"
 	"k8s.io/kubernetes/pkg/version"
 
@@ -160,7 +160,7 @@ func StartControllers(s *options.CMServer, restClientCfg *restclient.Config) err
 		namespaceController.Run(wait.NeverStop)
 	}
 
-	for kind, federatedType := range typeadapters.FederatedTypes() {
+	for kind, federatedType := range federatedtypes.FederatedTypes() {
 		if controllerEnabled(s.Controllers, serverResources, federatedType.ControllerName, federatedType.RequiredResources, true) {
 			// TODO the generic controller doesn't belong in the secretcontroller package
 			secretcontroller.StartFederationSyncController(kind, federatedType.AdapterFactory, restClientCfg, stopChan, minimizeLatency)

federation/pkg/federatedtypes/BUILD

@@ -39,7 +39,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//federation/pkg/typeadapters/crudtester:all-srcs",
+        "//federation/pkg/federatedtypes/crudtester:all-srcs",
     ],
     tags = ["automanaged"],
 )

federation/pkg/federatedtypes/adapter.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package typeadapters
+package federatedtypes
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -57,7 +57,7 @@ type FederatedTypeAdapter interface {
 }
 
 // AdapterFactory defines the function signature for factory methods
-// that create FederatedTypeAdapters.  Such methods should be
+// that create instances of FederatedTypeAdapter.  Such methods should
-// registered with RegisterAdapterFactory to ensure the type adapter
+// be registered with RegisterAdapterFactory to ensure the type
-// is discoverable.
+// adapter is discoverable.
 type AdapterFactory func(client federationclientset.Interface) FederatedTypeAdapter

federation/pkg/federatedtypes/crudtester/BUILD

@@ -12,7 +12,7 @@ go_library(
     srcs = ["crudtester.go"],
     tags = ["automanaged"],
     deps = [
-        "//federation/pkg/typeadapters:go_default_library",
+        "//federation/pkg/federatedtypes:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

federation/pkg/federatedtypes/crudtester/crudtester.go

@@ -23,7 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkgruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
 
@@ -44,7 +44,7 @@ type TestLogger interface {
 // members of a federation.
 type FederatedTypeCRUDTester struct {
 	tl             TestLogger
-	adapter        typeadapters.FederatedTypeAdapter
+	adapter        federatedtypes.FederatedTypeAdapter
 	kind           string
 	clusterClients []clientset.Interface
 	waitInterval   time.Duration
@@ -54,7 +54,7 @@ type FederatedTypeCRUDTester struct {
 	clusterWaitTimeout time.Duration
 }
 
-func NewFederatedTypeCRUDTester(testLogger TestLogger, adapter typeadapters.FederatedTypeAdapter, clusterClients []clientset.Interface, waitInterval, clusterWaitTimeout time.Duration) *FederatedTypeCRUDTester {
+func NewFederatedTypeCRUDTester(testLogger TestLogger, adapter federatedtypes.FederatedTypeAdapter, clusterClients []clientset.Interface, waitInterval, clusterWaitTimeout time.Duration) *FederatedTypeCRUDTester {
 	return &FederatedTypeCRUDTester{
 		tl:                 testLogger,
 		adapter:            adapter,

federation/pkg/federatedtypes/registry.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package typeadapters
+package federatedtypes
 
 import (
 	"fmt"

federation/pkg/federatedtypes/secret.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package typeadapters
+package federatedtypes
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

federation/pkg/federation-controller/secret/BUILD

@@ -15,10 +15,10 @@ go_library(
     deps = [
         "//federation/apis/federation/v1beta1:go_default_library",
         "//federation/client/clientset_generated/federation_clientset:go_default_library",
+        "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federation-controller/util:go_default_library",
         "//federation/pkg/federation-controller/util/deletionhelper:go_default_library",
         "//federation/pkg/federation-controller/util/eventsink:go_default_library",
-        "//federation/pkg/typeadapters:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/controller:go_default_library",
@@ -44,10 +44,10 @@ go_test(
     deps = [
         "//federation/apis/federation/v1beta1:go_default_library",
         "//federation/client/clientset_generated/federation_clientset/fake:go_default_library",
+        "//federation/pkg/federatedtypes:go_default_library",
         "//federation/pkg/federation-controller/util:go_default_library",
         "//federation/pkg/federation-controller/util/deletionhelper:go_default_library",
         "//federation/pkg/federation-controller/util/test:go_default_library",
-        "//federation/pkg/typeadapters:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",

federation/pkg/federation-controller/secret/secret_controller.go

@@ -33,10 +33,10 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 	federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
 	federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	"k8s.io/kubernetes/federation/pkg/federation-controller/util"
 	"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
 	"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
 	"k8s.io/kubernetes/pkg/api"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/controller"
@@ -83,11 +83,11 @@ type FederationSyncController struct {
 	smallDelay            time.Duration
 	updateTimeout         time.Duration
 
-	adapter typeadapters.FederatedTypeAdapter
+	adapter federatedtypes.FederatedTypeAdapter
 }
 
 // StartFederationSyncController starts a new sync controller for a type adapter
-func StartFederationSyncController(kind string, adapterFactory typeadapters.AdapterFactory, config *restclient.Config, stopChan <-chan struct{}, minimizeLatency bool) {
+func StartFederationSyncController(kind string, adapterFactory federatedtypes.AdapterFactory, config *restclient.Config, stopChan <-chan struct{}, minimizeLatency bool) {
 	restclient.AddUserAgent(config, fmt.Sprintf("%s-controller", kind))
 	client := federationclientset.NewForConfigOrDie(config)
 	adapter := adapterFactory(client)
@@ -100,7 +100,7 @@ func StartFederationSyncController(kind string, adapterFactory typeadapters.Adap
 }
 
 // newFederationSyncController returns a new sync controller for the given client and type adapter
-func newFederationSyncController(client federationclientset.Interface, adapter typeadapters.FederatedTypeAdapter) *FederationSyncController {
+func newFederationSyncController(client federationclientset.Interface, adapter federatedtypes.FederatedTypeAdapter) *FederationSyncController {
 	broadcaster := record.NewBroadcaster()
 	broadcaster.StartRecordingToSink(eventsink.NewFederatedEventSink(client))
 	recorder := broadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: fmt.Sprintf("federated-%v-controller", adapter.Kind())})

federation/pkg/federation-controller/secret/secret_controller_test.go

@@ -28,10 +28,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
 	fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	"k8s.io/kubernetes/federation/pkg/federation-controller/util"
 	"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
 	. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
 	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
@@ -67,7 +67,7 @@ func TestSecretController(t *testing.T) {
 	RegisterFakeList(secrets, &cluster2Client.Fake, &apiv1.SecretList{Items: []apiv1.Secret{}})
 	cluster2CreateChan := RegisterFakeCopyOnCreate(secrets, &cluster2Client.Fake, cluster2Watch)
 
-	secretController := newFederationSyncController(fakeClient, typeadapters.NewSecretAdapter(fakeClient))
+	secretController := newFederationSyncController(fakeClient, federatedtypes.NewSecretAdapter(fakeClient))
 	informerClientFactory := func(cluster *federationapi.Cluster) (kubeclientset.Interface, error) {
 		switch cluster.Name {
 		case cluster1.Name:

test/integration/federation/BUILD

@@ -16,7 +16,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//federation/apis/federation/v1beta1:go_default_library",
-        "//federation/pkg/typeadapters:go_default_library",
+        "//federation/pkg/federatedtypes:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/apis/batch/v1:go_default_library",

test/integration/federation/crud_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	"k8s.io/kubernetes/test/integration/federation/framework"
 )
 
@@ -32,7 +32,7 @@ func TestFederationCRUD(t *testing.T) {
 	fedFixture.SetUp(t)
 	defer fedFixture.TearDown(t)
 
-	federatedTypes := typeadapters.FederatedTypes()
+	federatedTypes := federatedtypes.FederatedTypes()
 	for kind, fedType := range federatedTypes {
 		t.Run(kind, func(t *testing.T) {
 			config := fedFixture.APIFixture.NewConfig()
@@ -55,8 +55,8 @@ func TestFederationCRUD(t *testing.T) {
 		"Resources should not be deleted from underlying clusters when OrphanDependents is true": &orphanedDependents,
 		"Resources should not be deleted from underlying clusters when OrphanDependents is nil":  nil,
 	}
-	kind := typeadapters.SecretKind
+	kind := federatedtypes.SecretKind
-	adapterFactory := typeadapters.NewSecretAdapter
+	adapterFactory := federatedtypes.NewSecretAdapter
 	for testName, orphanDependents := range testCases {
 		t.Run(testName, func(t *testing.T) {
 			config := fedFixture.APIFixture.NewConfig()

test/integration/federation/framework/BUILD

@@ -22,10 +22,10 @@ go_library(
         "//federation/client/clientset_generated/federation_clientset:go_default_library",
         "//federation/cmd/federation-apiserver/app:go_default_library",
         "//federation/cmd/federation-apiserver/app/options:go_default_library",
+        "//federation/pkg/federatedtypes:go_default_library",
+        "//federation/pkg/federatedtypes/crudtester:go_default_library",
         "//federation/pkg/federation-controller/cluster:go_default_library",
         "//federation/pkg/federation-controller/secret:go_default_library",
-        "//federation/pkg/typeadapters:go_default_library",
-        "//federation/pkg/typeadapters/crudtester:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/master:go_default_library",
         "//test/integration/framework:go_default_library",

test/integration/federation/framework/controller.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	restclient "k8s.io/client-go/rest"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	secretcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/secret"
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
 )
 
 // ControllerFixture manages a federation controller for testing.
@@ -30,7 +30,7 @@ type ControllerFixture struct {
 }
 
 // NewControllerFixture initializes a new controller fixture
-func NewControllerFixture(t *testing.T, kind string, adapterFactory typeadapters.AdapterFactory, config *restclient.Config) *ControllerFixture {
+func NewControllerFixture(t *testing.T, kind string, adapterFactory federatedtypes.AdapterFactory, config *restclient.Config) *ControllerFixture {
 	f := &ControllerFixture{
 		stopChan: make(chan struct{}),
 	}

test/integration/federation/framework/crudtester.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/kubernetes/federation/pkg/typeadapters"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes"
-	"k8s.io/kubernetes/federation/pkg/typeadapters/crudtester"
+	"k8s.io/kubernetes/federation/pkg/federatedtypes/crudtester"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
 
@@ -41,7 +41,7 @@ func (l *IntegrationLogger) Fatal(msg string) {
 	l.t.Fatal(msg)
 }
 
-func NewFederatedTypeCRUDTester(t *testing.T, adapter typeadapters.FederatedTypeAdapter, clusterClients []clientset.Interface) *crudtester.FederatedTypeCRUDTester {
+func NewFederatedTypeCRUDTester(t *testing.T, adapter federatedtypes.FederatedTypeAdapter, clusterClients []clientset.Interface) *crudtester.FederatedTypeCRUDTester {
 	logger := &IntegrationLogger{t}
 	return crudtester.NewFederatedTypeCRUDTester(logger, adapter, clusterClients, DefaultWaitInterval, wait.ForeverTestTimeout)
 }