[Federation] Make arguments to scheduling type adapter methods generic

federation/pkg/federatedtypes/deployment.go

@@ -47,15 +47,16 @@ type DeploymentAdapter struct {
 func NewDeploymentAdapter(client federationclientset.Interface, config *restclient.Config) FederatedTypeAdapter {
 	schedulingAdapter := schedulingAdapter{
 		preferencesAnnotationName: FedDeploymentPreferencesAnnotation,
-		updateStatusFunc: func(obj pkgruntime.Object, status SchedulingStatus) error {
+		updateStatusFunc: func(obj pkgruntime.Object, status interface{}) error {
 			deployment := obj.(*extensionsv1.Deployment)
-			if status.Replicas != deployment.Status.Replicas || status.UpdatedReplicas != deployment.Status.UpdatedReplicas ||
-				status.ReadyReplicas != deployment.Status.ReadyReplicas || status.AvailableReplicas != deployment.Status.AvailableReplicas {
+			typedStatus := status.(ReplicaSchedulingStatus)
+			if typedStatus.Replicas != deployment.Status.Replicas || typedStatus.UpdatedReplicas != deployment.Status.UpdatedReplicas ||
+				typedStatus.ReadyReplicas != deployment.Status.ReadyReplicas || typedStatus.AvailableReplicas != deployment.Status.AvailableReplicas {
 				deployment.Status = extensionsv1.DeploymentStatus{
-					Replicas:          status.Replicas,
-					UpdatedReplicas:   status.UpdatedReplicas,
-					ReadyReplicas:     status.ReadyReplicas,
-					AvailableReplicas: status.AvailableReplicas,
+					Replicas:          typedStatus.Replicas,
+					UpdatedReplicas:   typedStatus.UpdatedReplicas,
+					ReadyReplicas:     typedStatus.ReadyReplicas,
+					AvailableReplicas: typedStatus.AvailableReplicas,
 				}
 				_, err := client.Extensions().Deployments(deployment.Namespace).UpdateStatus(deployment)
 				return err

federation/pkg/federatedtypes/replicaset.go

@@ -47,15 +47,16 @@ type ReplicaSetAdapter struct {
 func NewReplicaSetAdapter(client federationclientset.Interface, config *restclient.Config) FederatedTypeAdapter {
 	schedulingAdapter := schedulingAdapter{
 		preferencesAnnotationName: FedReplicaSetPreferencesAnnotation,
-		updateStatusFunc: func(obj pkgruntime.Object, status SchedulingStatus) error {
+		updateStatusFunc: func(obj pkgruntime.Object, status interface{}) error {
 			rs := obj.(*extensionsv1.ReplicaSet)
-			if status.Replicas != rs.Status.Replicas || status.FullyLabeledReplicas != rs.Status.FullyLabeledReplicas ||
-				status.ReadyReplicas != rs.Status.ReadyReplicas || status.AvailableReplicas != rs.Status.AvailableReplicas {
+			typedStatus := status.(ReplicaSchedulingStatus)
+			if typedStatus.Replicas != rs.Status.Replicas || typedStatus.FullyLabeledReplicas != rs.Status.FullyLabeledReplicas ||
+				typedStatus.ReadyReplicas != rs.Status.ReadyReplicas || typedStatus.AvailableReplicas != rs.Status.AvailableReplicas {
 				rs.Status = extensionsv1.ReplicaSetStatus{
-					Replicas:             status.Replicas,
-					FullyLabeledReplicas: status.Replicas,
-					ReadyReplicas:        status.ReadyReplicas,
-					AvailableReplicas:    status.AvailableReplicas,
+					Replicas:             typedStatus.Replicas,
+					FullyLabeledReplicas: typedStatus.Replicas,
+					ReadyReplicas:        typedStatus.ReadyReplicas,
+					AvailableReplicas:    typedStatus.AvailableReplicas,
 				}
 				_, err := client.Extensions().ReplicaSets(rs.Namespace).UpdateStatus(rs)
 				return err

federation/pkg/federatedtypes/scheduling.go

@@ -37,9 +37,9 @@ import (
 	"github.com/golang/glog"
 )
 
-// SchedulingStatus contains the status of the objects that are being
-// scheduled into joined clusters.
-type SchedulingStatus struct {
+// ReplicaSchedulingStatus contains the status of the replica type objects (rs or deployment)
+// that are being scheduled into joined clusters.
+type ReplicaSchedulingStatus struct {
 	Replicas             int32
 	UpdatedReplicas      int32
 	FullyLabeledReplicas int32
@@ -47,19 +47,19 @@ type SchedulingStatus struct {
 	AvailableReplicas    int32
 }
 
-// SchedulingInfo wraps the information that a SchedulingAdapter needs
-// to update objects per a schedule.
-type SchedulingInfo struct {
+// ReplicaSchedulingInfo wraps the information that a replica type (rs or deployment)
+// SchedulingAdapter needs to update objects per a schedule.
+type ReplicaSchedulingInfo struct {
 	Schedule map[string]int64
-	Status   SchedulingStatus
+	Status   ReplicaSchedulingStatus
 }
 
 // SchedulingAdapter defines operations for interacting with a
 // federated type that requires more complex synchronization logic.
 type SchedulingAdapter interface {
-	GetSchedule(obj pkgruntime.Object, key string, clusters []*federationapi.Cluster, informer fedutil.FederatedInformer) (*SchedulingInfo, error)
-	ScheduleObject(cluster *federationapi.Cluster, clusterObj pkgruntime.Object, federationObjCopy pkgruntime.Object, schedulingInfo *SchedulingInfo) (pkgruntime.Object, bool, error)
-	UpdateFederatedStatus(obj pkgruntime.Object, status SchedulingStatus) error
+	GetSchedule(obj pkgruntime.Object, key string, clusters []*federationapi.Cluster, informer fedutil.FederatedInformer) (interface{}, error)
+	ScheduleObject(cluster *federationapi.Cluster, clusterObj pkgruntime.Object, federationObjCopy pkgruntime.Object, schedulingInfo interface{}) (pkgruntime.Object, bool, error)
+	UpdateFederatedStatus(obj pkgruntime.Object, status interface{}) error
 
 	// EquivalentIgnoringSchedule returns whether obj1 and obj2 are
 	// equivalent ignoring differences due to scheduling.
@@ -70,14 +70,14 @@ type SchedulingAdapter interface {
 // workload scheduling.
 type schedulingAdapter struct {
 	preferencesAnnotationName string
-	updateStatusFunc          func(pkgruntime.Object, SchedulingStatus) error
+	updateStatusFunc          func(pkgruntime.Object, interface{}) error
 }
 
 func (a *schedulingAdapter) IsSchedulingAdapter() bool {
 	return true
 }
 
-func (a *schedulingAdapter) GetSchedule(obj pkgruntime.Object, key string, clusters []*federationapi.Cluster, informer fedutil.FederatedInformer) (*SchedulingInfo, error) {
+func (a *schedulingAdapter) GetSchedule(obj pkgruntime.Object, key string, clusters []*federationapi.Cluster, informer fedutil.FederatedInformer) (interface{}, error) {
 	var clusterNames []string
 	for _, cluster := range clusters {
 		clusterNames = append(clusterNames, cluster.Name)
@@ -122,14 +122,15 @@ func (a *schedulingAdapter) GetSchedule(obj pkgruntime.Object, key string, clust
 
 	plnr := planner.NewPlanner(fedPref)
 
-	return &SchedulingInfo{
+	return &ReplicaSchedulingInfo{
 		Schedule: schedule(plnr, obj, key, clusterNames, currentReplicasPerCluster, estimatedCapacity),
-		Status:   SchedulingStatus{},
+		Status:   ReplicaSchedulingStatus{},
 	}, nil
 }
 
-func (a *schedulingAdapter) ScheduleObject(cluster *federationapi.Cluster, clusterObj pkgruntime.Object, federationObjCopy pkgruntime.Object, schedulingInfo *SchedulingInfo) (pkgruntime.Object, bool, error) {
-	replicas, ok := schedulingInfo.Schedule[cluster.Name]
+func (a *schedulingAdapter) ScheduleObject(cluster *federationapi.Cluster, clusterObj pkgruntime.Object, federationObjCopy pkgruntime.Object, schedulingInfo interface{}) (pkgruntime.Object, bool, error) {
+	typedSchedulingInfo := schedulingInfo.(*ReplicaSchedulingInfo)
+	replicas, ok := typedSchedulingInfo.Schedule[cluster.Name]
 	if !ok {
 		replicas = 0
 	}
@@ -138,7 +139,7 @@ func (a *schedulingAdapter) ScheduleObject(cluster *federationapi.Cluster, clust
 	reflect.ValueOf(federationObjCopy).Elem().FieldByName("Spec").FieldByName("Replicas").Set(reflect.ValueOf(&specReplicas))
 
 	if clusterObj != nil {
-		schedulingStatusVal := reflect.ValueOf(schedulingInfo).Elem().FieldByName("Status")
+		schedulingStatusVal := reflect.ValueOf(typedSchedulingInfo).Elem().FieldByName("Status")
 		objStatusVal := reflect.ValueOf(clusterObj).Elem().FieldByName("Status")
 		for i := 0; i < schedulingStatusVal.NumField(); i++ {
 			schedulingStatusField := schedulingStatusVal.Field(i)
@@ -154,7 +155,7 @@ func (a *schedulingAdapter) ScheduleObject(cluster *federationapi.Cluster, clust
 	return federationObjCopy, replicas > 0, nil
 }
 
-func (a *schedulingAdapter) UpdateFederatedStatus(obj pkgruntime.Object, status SchedulingStatus) error {
+func (a *schedulingAdapter) UpdateFederatedStatus(obj pkgruntime.Object, status interface{}) error {
 	return a.updateStatusFunc(obj, status)
 }
 

federation/pkg/federation-controller/sync/controller.go

@@ -366,7 +366,7 @@ func (s *FederationSyncController) reconcile(qualifiedName federatedtypes.Qualif
 		return statusError
 	}
 
-	operationsAccessor := func(adapter federatedtypes.FederatedTypeAdapter, selectedClusters []*federationapi.Cluster, unselectedClusters []*federationapi.Cluster, obj pkgruntime.Object, schedulingInfo *federatedtypes.SchedulingInfo) ([]util.FederatedOperation, error) {
+	operationsAccessor := func(adapter federatedtypes.FederatedTypeAdapter, selectedClusters []*federationapi.Cluster, unselectedClusters []*federationapi.Cluster, obj pkgruntime.Object, schedulingInfo interface{}) ([]util.FederatedOperation, error) {
 		operations, err := clusterOperations(adapter, selectedClusters, unselectedClusters, obj, key, schedulingInfo, func(clusterName string) (interface{}, bool, error) {
 			return s.informer.GetTargetStore().GetByKey(clusterName, key)
 		})
@@ -445,7 +445,7 @@ func (s *FederationSyncController) delete(obj pkgruntime.Object, kind string, qu
 }
 
 type clustersAccessorFunc func() ([]*federationapi.Cluster, error)
-type operationsFunc func(federatedtypes.FederatedTypeAdapter, []*federationapi.Cluster, []*federationapi.Cluster, pkgruntime.Object, *federatedtypes.SchedulingInfo) ([]util.FederatedOperation, error)
+type operationsFunc func(federatedtypes.FederatedTypeAdapter, []*federationapi.Cluster, []*federationapi.Cluster, pkgruntime.Object, interface{}) ([]util.FederatedOperation, error)
 type clusterSelectorFunc func(*metav1.ObjectMeta, func(map[string]string, map[string]string) (bool, error), []*federationapi.Cluster) ([]*federationapi.Cluster, []*federationapi.Cluster, error)
 type executionFunc func([]util.FederatedOperation) error
 
@@ -467,7 +467,7 @@ func syncToClusters(clustersAccessor clustersAccessorFunc, operationsAccessor op
 		return statusError
 	}
 
-	var schedulingInfo *federatedtypes.SchedulingInfo
+	var schedulingInfo interface{}
 	if adapter.IsSchedulingAdapter() {
 		schedulingAdapter, ok := adapter.(federatedtypes.SchedulingAdapter)
 		if !ok {
@@ -490,7 +490,8 @@ func syncToClusters(clustersAccessor clustersAccessorFunc, operationsAccessor op
 		if !ok {
 			glog.Fatalf("Adapter for kind %q does not properly implement SchedulingAdapter.", kind)
 		}
-		err = schedulingAdapter.UpdateFederatedStatus(obj, schedulingInfo.Status)
+		typedScheduleInfo := schedulingInfo.(*federatedtypes.ReplicaSchedulingInfo)
+		err = schedulingAdapter.UpdateFederatedStatus(obj, typedScheduleInfo.Status)
 		if err != nil {
 			runtime.HandleError(fmt.Errorf("adapter.UpdateFinished() failed on adapter for %s %q: %v", kind, key, err))
 			return statusError
@@ -532,7 +533,7 @@ func selectedClusters(objMeta *metav1.ObjectMeta, selector func(map[string]strin
 type clusterObjectAccessorFunc func(clusterName string) (interface{}, bool, error)
 
 // clusterOperations returns the list of operations needed to synchronize the state of the given object to the provided clusters
-func clusterOperations(adapter federatedtypes.FederatedTypeAdapter, selectedClusters []*federationapi.Cluster, unselectedClusters []*federationapi.Cluster, obj pkgruntime.Object, key string, schedulingInfo *federatedtypes.SchedulingInfo, accessor clusterObjectAccessorFunc) ([]util.FederatedOperation, error) {
+func clusterOperations(adapter federatedtypes.FederatedTypeAdapter, selectedClusters []*federationapi.Cluster, unselectedClusters []*federationapi.Cluster, obj pkgruntime.Object, key string, schedulingInfo interface{}, accessor clusterObjectAccessorFunc) ([]util.FederatedOperation, error) {
 	operations := make([]util.FederatedOperation, 0)
 
 	kind := adapter.Kind()

federation/pkg/federation-controller/sync/controller_test.go

@@ -75,7 +75,7 @@ func TestSyncToClusters(t *testing.T) {
 					}
 					return nil, nil
 				},
-				func(federatedtypes.FederatedTypeAdapter, []*federationapi.Cluster, []*federationapi.Cluster, pkgruntime.Object, *federatedtypes.SchedulingInfo) ([]util.FederatedOperation, error) {
+				func(federatedtypes.FederatedTypeAdapter, []*federationapi.Cluster, []*federationapi.Cluster, pkgruntime.Object, interface{}) ([]util.FederatedOperation, error) {
 					if testCase.operationsError {
 						return nil, awfulError
 					}