Merge pull request kubevirt#213 from rmohr/migration

Refactor migration controller

cmd/virt-controller/virt-controller.go

@@ -83,27 +83,15 @@ func main() {
 	// Wait until VM cache has warmed up before we start watching pods
 	vmController.WaitForSync(stop)
 
-	//TODO order the parameters consistantly in the factories, or use an object.
-	_, migrationController, migrationQueue := watch.NewMigrationController(vmService, nil, restClient, clientSet)
-	migrationController.StartInformer(stop)
+	//FIXME when we have more than one worker, we need a lock on the VM
+	migrationController := watch.NewMigrationController(vmService, restClient, clientSet)
 	go migrationController.Run(1, stop)
-	migrationController.WaitForSync(stop)
 
 	// Start watching pods
 	_, podController := watch.NewPodController(vmCache, nil, clientSet, restClient, vmService)
 	podController.StartInformer(stop)
 	go podController.Run(1, stop)
 
-	_, migrationPodController := watch.NewMigrationPodController(vmCache, nil, clientSet, restClient, vmService, *migrationQueue)
-	migrationPodController.StartInformer(stop)
-	//FIXME when we have more than one worker, we need a lock on the VM
-	go migrationPodController.Run(1, stop)
-
-	_, jobController := watch.NewJobController(vmService, nil, clientSet, restClient, *migrationQueue)
-	jobController.StartInformer(stop)
-	go jobController.Run(1, stop)
-	jobController.WaitForSync(stop)
-
 	httpLogger := logger.With("service", "http")
 
 	httpLogger.Info().Log("action", "listening", "interface", *host, "port", *port)

pkg/api/v1/types.go

@@ -366,9 +366,6 @@ const (
 	// Create Migration has been called but nothing has been done with it
 	MigrationUnknown MigrationPhase = ""
 
-	// Migration is actively progressing
-	MigrationScheduled MigrationPhase = "Scheduled"
-
 	// Migration has been scheduled but no update on the status has been recorded
 	MigrationRunning MigrationPhase = "Running"
 
@@ -383,7 +380,8 @@ const (
 // MigrationStatus is the last reported status of a VM Migratrion. Status may trail the actual
 // state of a migration.
 type MigrationStatus struct {
-	Phase MigrationPhase `json:"phase,omitempty"`
+	Phase    MigrationPhase `json:"phase,omitempty"`
+	Instance *types.UID     `json:"instance,omitempty"`
 }
 
 // Required to satisfy ObjectMetaAccessor interface

pkg/kubecli/kubecli.go

@@ -136,6 +136,21 @@ func NewResourceEventHandlerFuncsForWorkqueue(queue workqueue.RateLimitingInterf
 	}
 }
 
+func NewResourceEventHandlerFuncsForFunc(f func(interface{})) cache.ResourceEventHandlerFuncs {
+	return cache.ResourceEventHandlerFuncs{
+		AddFunc: func(obj interface{}) {
+			f(obj)
+		},
+		UpdateFunc: func(old interface{}, new interface{}) {
+			f(new)
+
+		},
+		DeleteFunc: func(obj interface{}) {
+			f(obj)
+		},
+	}
+}
+
 type Controller struct {
 	indexer  cache.Store
 	queue    workqueue.RateLimitingInterface

pkg/virt-controller/services/vm_test.go

@@ -54,7 +54,7 @@ var _ = Describe("VM", func() {
 			migration = v1.NewMinimalMigration(vm.ObjectMeta.Name+"-migration", vm.ObjectMeta.Name)
 			expected_migration = &v1.Migration{}
 			*expected_migration = *migration
-			expected_migration.Status.Phase = v1.MigrationScheduled
+			expected_migration.Status.Phase = v1.MigrationRunning
 
 			vm.ObjectMeta.UID = "testUID"
 			vm.ObjectMeta.SetUID(uuid.NewUUID())