Skip to content
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.

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

feat(vmclass): freeze features after first discovery #464

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ func (h *DiscoveryHandler) Handle(ctx context.Context, s state.VirtualMachineCla
}

cpuType := current.Spec.CPU.Type
//nolint:staticcheck
mgr := conditions.NewManager(changed.Status.Conditions)

if cpuType == virtv2.CPUTypeHostPassthrough || cpuType == virtv2.CPUTypeHost {
mgr.Update(conditions.NewConditionBuilder(vmclasscondition.TypeDiscovered).
cb := conditions.NewConditionBuilder(vmclasscondition.TypeDiscovered).
Generation(current.GetGeneration()).
Message(fmt.Sprintf("Discovery not needed for cpu.type %q", cpuType)).
Reason(vmclasscondition.ReasonDiscoverySkip).
Status(metav1.ConditionFalse).Condition())
changed.Status.Conditions = mgr.Generate()
Status(metav1.ConditionFalse)

conditions.SetCondition(cb, &changed.Status.Conditions)
return reconcile.Result{}, nil
}

Expand All @@ -79,16 +79,19 @@ func (h *DiscoveryHandler) Handle(ctx context.Context, s state.VirtualMachineCla
availableNodes[i] = n.GetName()
}

var featuresEnabled []string
var (
featuresEnabled []string
featuresNotEnabled []string
)
switch cpuType {
case virtv2.CPUTypeDiscovery:
if changed.Status.Phase == virtv2.ClassPhaseReady {
featuresEnabled = changed.Status.CpuFeatures.Enabled
break
}
featuresEnabled = h.discoveryCommonFeatures(nodes)
case virtv2.CPUTypeFeatures:
featuresEnabled = current.Spec.CPU.Features
}

var featuresNotEnabled []string
if cpuType == virtv2.CPUTypeDiscovery || cpuType == virtv2.CPUTypeFeatures {
selectedNodes, err := s.NodesByVMNodeSelector(ctx)
if err != nil {
return reconcile.Result{}, err
Expand Down Expand Up @@ -116,13 +119,12 @@ func (h *DiscoveryHandler) Handle(ctx context.Context, s state.VirtualMachineCla
Status(metav1.ConditionFalse)
}

mgr.Update(cb.Condition())
conditions.SetCondition(cb, &changed.Status.Conditions)

sort.Strings(availableNodes)
sort.Strings(featuresEnabled)
sort.Strings(featuresNotEnabled)

changed.Status.Conditions = mgr.Generate()
changed.Status.AvailableNodes = availableNodes
changed.Status.CpuFeatures = virtv2.CpuFeatures{
Enabled: featuresEnabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ func (h *LifeCycleHandler) Handle(_ context.Context, s state.VirtualMachineClass
return reconcile.Result{Requeue: true}, nil
}

//nolint:staticcheck
mgr := conditions.NewManager(changed.Status.Conditions)
cb := conditions.NewConditionBuilder(vmclasscondition.TypeReady).
Generation(current.GetGeneration())
var phase virtv2.VirtualMachineClassPhase
Expand Down Expand Up @@ -103,9 +101,7 @@ func (h *LifeCycleHandler) Handle(_ context.Context, s state.VirtualMachineClass
Reason(vmclasscondition.ReasonSuitableNodesFound).
Status(metav1.ConditionTrue)
}

mgr.Update(cb.Condition())
changed.Status.Conditions = mgr.Generate()
conditions.SetCondition(cb, &changed.Status.Conditions)
changed.Status.Phase = phase

return reconcile.Result{}, nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vmclasscondition"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vmcondition"
)

func isDeletion(class *virtv2.VirtualMachineClass) bool {
return class == nil || !class.GetDeletionTimestamp().IsZero()
}

func addAllUnknown(class *virtv2.VirtualMachineClass, conds ...vmclasscondition.Type) (update bool) {
//nolint:staticcheck
mgr := conditions.NewManager(class.Status.Conditions)
for _, c := range conds {
if add := mgr.Add(conditions.NewConditionBuilder(c).
Generation(class.GetGeneration()).
Reason(vmclasscondition.ReasonUnknown).
Status(metav1.ConditionUnknown).
Condition()); add {
update = true
func addAllUnknown(vm *virtv2.VirtualMachineClass, conds ...vmclasscondition.Type) (update bool) {
for _, cond := range conds {
if conditions.HasCondition(cond, vm.Status.Conditions) {
continue
}
cb := conditions.NewConditionBuilder(cond).
Generation(vm.GetGeneration()).
Reason(vmcondition.ReasonUnknown).
Status(metav1.ConditionUnknown)
conditions.SetCondition(cb, &vm.Status.Conditions)
update = true
}
class.Status.Conditions = mgr.Generate()
return
}
Loading