@@ -20,7 +20,6 @@ import (
2020 "context"
2121 "fmt"
2222 "reflect"
23- "time"
2423
2524 "sigs.k8s.io/controller-runtime/pkg/client"
2625 "sigs.k8s.io/controller-runtime/pkg/controller"
@@ -31,6 +30,7 @@ import (
3130
3231 "github.com/deckhouse/virtualization-controller/pkg/controller/reconciler"
3332 "github.com/deckhouse/virtualization-controller/pkg/controller/vm/internal/state"
33+ "github.com/deckhouse/virtualization-controller/pkg/controller/vm/internal/watcher"
3434 "github.com/deckhouse/virtualization-controller/pkg/logger"
3535 "github.com/deckhouse/virtualization/api/core/v1alpha2"
3636)
@@ -62,17 +62,17 @@ func (r *Reconciler) SetupController(_ context.Context, mgr manager.Manager, ctr
6262 }
6363
6464 for _ , w := range []Watcher {
65- // watcher.NewKVVMWatcher(),
66- // watcher.NewKVVMIWatcher(),
67- // watcher.NewPodWatcher(),
68- // watcher.NewVirtualImageWatcher(mgr.GetClient()),
69- // watcher.NewClusterVirtualImageWatcher(mgr.GetClient()),
70- // watcher.NewVirtualDiskWatcher(mgr.GetClient()),
71- // watcher.NewVMIPWatcher(),
72- // watcher.NewVirtualMachineClassWatcher(),
73- // watcher.NewVirtualMachineSnapshotWatcher(),
74- // watcher.NewVMOPWatcher(),
75- // watcher.NewVMMACWatcher(),
65+ watcher .NewKVVMWatcher (),
66+ watcher .NewKVVMIWatcher (),
67+ watcher .NewPodWatcher (),
68+ watcher .NewVirtualImageWatcher (mgr .GetClient ()),
69+ watcher .NewClusterVirtualImageWatcher (mgr .GetClient ()),
70+ watcher .NewVirtualDiskWatcher (mgr .GetClient ()),
71+ watcher .NewVMIPWatcher (),
72+ watcher .NewVirtualMachineClassWatcher (),
73+ watcher .NewVirtualMachineSnapshotWatcher (),
74+ watcher .NewVMOPWatcher (),
75+ watcher .NewVMMACWatcher (),
7676 } {
7777 err := w .Watch (mgr , ctr )
7878 if err != nil {
@@ -108,16 +108,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
108108 return vm .Update (ctx )
109109 })
110110
111- res , err := rec .Reconcile (ctx )
112- if err != nil {
113- return reconcile.Result {}, err
114- }
115-
116- if vm .Changed ().Status .Phase != v1alpha2 .MachineRunning {
117- res .RequeueAfter = time .Second * 30
118- }
119-
120- return res , nil
111+ return rec .Reconcile (ctx )
121112}
122113
123114func (r * Reconciler ) factory () * v1alpha2.VirtualMachine {
0 commit comments