Skip to content

fix(vm): set AgentReady from VMI instead of stale phase #2556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
loktev-d wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(vm): set AgentReady from VMI instead of stale phase #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions images/virtualization-artifact/pkg/controller/vm/internal/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,24 +69,16 @@ func (h *AgentHandler) syncAgentReady(vm *v1alpha2.VirtualMachine, kvvmi *virtv1
return
}

cb := conditions.NewConditionBuilder(vmcondition.TypeAgentReady).Generation(vm.GetGeneration())

defer func() {
phase := vm.Status.Phase
if phase == v1alpha2.MachinePending || phase == v1alpha2.MachineStarting || phase == v1alpha2.MachineStopped {
conditions.RemoveCondition(vmcondition.TypeAgentReady, &vm.Status.Conditions)
} else {
conditions.SetCondition(cb, &vm.Status.Conditions)
}
}()

if kvvmi == nil {
cb.Status(metav1.ConditionFalse).
Reason(vmcondition.ReasonAgentNotReady).
Message("VirtualMachine is not running.")
conditions.RemoveCondition(vmcondition.TypeAgentReady, &vm.Status.Conditions)
return
}

cb := conditions.NewConditionBuilder(vmcondition.TypeAgentReady).Generation(vm.GetGeneration())
defer func() {
conditions.SetCondition(cb, &vm.Status.Conditions)
}()

for _, c := range kvvmi.Status.Conditions {
if c.Type == virtv1.VirtualMachineInstanceAgentConnected {
status := conditionStatus(string(c.Status))
Expand Down
32 changes: 16 additions & 16 deletions images/virtualization-artifact/pkg/controller/vm/internal/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@ var _ = Describe("AgentHandler Tests", func() {
}

DescribeTable("AgentReady Condition Tests",
func(phase v1alpha2.MachinePhase, agentConnected bool, expectedStatus metav1.ConditionStatus, expectedExistence bool) {
func(phase v1alpha2.MachinePhase, kvvmiExists, agentConnected bool, expectedStatus metav1.ConditionStatus, expectedExistence bool) {
vm := newVM(phase)
kvvmi := newKVVMI(agentConnected, false)
fakeClient, resource, vmState = setupEnvironment(vm, kvvmi)
if kvvmiExists {
fakeClient, resource, vmState = setupEnvironment(vm, newKVVMI(agentConnected, false))
} else {
fakeClient, resource, vmState = setupEnvironment(vm)
}

reconcile()

Expand All @@ -111,23 +114,20 @@ var _ = Describe("AgentHandler Tests", func() {
Expect(cond.Status).To(Equal(expectedStatus))
}
},
Entry("Should add AgentReady as True if agent is connected", v1alpha2.MachineRunning, true, metav1.ConditionTrue, true),
Entry("Should add AgentReady as False if agent is not connected", v1alpha2.MachineRunning, false, metav1.ConditionFalse, true),

Entry("Should add AgentReady as True if agent is connected", v1alpha2.MachineStopping, true, metav1.ConditionTrue, true),
Entry("Should add AgentReady as False if agent is not connected", v1alpha2.MachineStopping, false, metav1.ConditionFalse, true),
Entry("Should add AgentReady as True if agent is connected", v1alpha2.MachineRunning, true, true, metav1.ConditionTrue, true),
Entry("Should add AgentReady as False if agent is not connected", v1alpha2.MachineRunning, true, false, metav1.ConditionFalse, true),

Entry("Should add AgentReady as True if agent is connected", v1alpha2.MachineMigrating, true, metav1.ConditionTrue, true),
Entry("Should add AgentReady as False if agent is not connected", v1alpha2.MachineMigrating, false, metav1.ConditionFalse, true),
Entry("Should add AgentReady as True if agent is connected", v1alpha2.MachineStopping, true, true, metav1.ConditionTrue, true),
Entry("Should add AgentReady as False if agent is not connected", v1alpha2.MachineStopping, true, false, metav1.ConditionFalse, true),

Entry("Should not add AgentReady if VM is in Pending phase and the agent is connected", v1alpha2.MachinePending, true, metav1.ConditionUnknown, false),
Entry("Should not add AgentReady if VM is in Pending phase and the agent is not connected", v1alpha2.MachinePending, false, metav1.ConditionUnknown, false),
Entry("Should add AgentReady as True if agent is connected", v1alpha2.MachineMigrating, true, true, metav1.ConditionTrue, true),
Entry("Should add AgentReady as False if agent is not connected", v1alpha2.MachineMigrating, true, false, metav1.ConditionFalse, true),

Entry("Should not add AgentReady if VM is in Starting phase and the agent is connected", v1alpha2.MachineStarting, true, metav1.ConditionUnknown, false),
Entry("Should not add AgentReady if VM is in Starting phase and the agent is not connected", v1alpha2.MachineStarting, false, metav1.ConditionUnknown, false),
Entry("Should not add AgentReady if VM is in Pending phase and there is no instance", v1alpha2.MachinePending, false, false, metav1.ConditionUnknown, false),
Entry("Should not add AgentReady if VM is in Stopped phase and there is no instance", v1alpha2.MachineStopped, false, false, metav1.ConditionUnknown, false),
Entry("Should not add AgentReady if VM is in Starting phase and there is no instance", v1alpha2.MachineStarting, false, false, metav1.ConditionUnknown, false),

Entry("Should not add AgentReady if VM is in Stopped phase and the agent is connected", v1alpha2.MachineStopped, true, metav1.ConditionUnknown, false),
Entry("Should not add AgentReady if VM is in Stopped phase and the agent is not connected", v1alpha2.MachineStopped, false, metav1.ConditionUnknown, false),
Entry("Should add AgentReady as True if agent is connected while phase still lags at Starting", v1alpha2.MachineStarting, true, true, metav1.ConditionTrue, true),
)

DescribeTable("AgentVersionNotSupported Condition Tests",
Expand Down
Loading