fix(vm): add value of the guest os info

- fix adding value of the guest os info from VMI to VM - fix bug with sticking 'Message' in 'Status' for VM Signed-off-by: Dmitry Lopatin <[email protected]>
deckhouse · May 16, 2024 · 1ffcab7 · 1ffcab7
1 parent 0b21bab
commit 1ffcab7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/crds/virtualmachine.yaml b/crds/virtualmachine.yaml
@@ -910,6 +910,7 @@ spec:
               properties:
                 guestOSInfo:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                   description: |
                     Guest OS information obtained from the QEMU Guest Agent. The agent must be pre-installed.
 

diff --git a/images/virtualization-artifact/pkg/controller/vm_reconciler.go b/images/virtualization-artifact/pkg/controller/vm_reconciler.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"reflect"
 	"strings"
 	"time"
 
@@ -96,7 +97,7 @@ func (r *VMReconciler) SetupController(_ context.Context, mgr manager.Manager, c
 			UpdateFunc: func(e event.UpdateEvent) bool {
 				oldVM := e.ObjectOld.(*virtv1.VirtualMachineInstance)
 				newVM := e.ObjectNew.(*virtv1.VirtualMachineInstance)
-				return oldVM.Status.Phase != newVM.Status.Phase
+				return !reflect.DeepEqual(oldVM.Status, newVM.Status)
 			},
 		},
 	); err != nil {
@@ -319,7 +320,6 @@ func (r *VMReconciler) UpdateStatus(_ context.Context, _ reconcile.Request, stat
 	case state.vmIsStarting():
 		state.VM.Changed().Status.Phase = virtv2.MachineStarting
 	case state.vmIsRunning():
-		// TODO We need to rerun this block because KVVMI status fields may be updated with a delay.
 		state.VM.Changed().Status.Phase = virtv2.MachineRunning
 		state.VM.Changed().Status.GuestOSInfo = state.KVVMI.Status.GuestOSInfo
 		state.VM.Changed().Status.Node = state.KVVMI.Status.NodeName

diff --git a/images/virtualization-artifact/pkg/controller/vm_reconciler_state.go b/images/virtualization-artifact/pkg/controller/vm_reconciler_state.go
@@ -207,7 +207,6 @@ func (state *VMReconcilerState) Reload(ctx context.Context, req reconcile.Reques
 	state.VMDByName = vmdByName
 	state.VMIByName = vmiByName
 	state.CVMIByName = cvmiByName
-	state.StatusMessage = state.VM.Current().Status.Message
 	state.RestartAwaitingChanges = state.VM.Current().Status.RestartAwaitingChanges
 
 	return nil