Skip to content

Commit ce286aa

Browse files
committed
fix kubevirt cpu check + update sdk version in go.mod
Signed-off-by: soer3n <[email protected]> revert change regarding import of sdk submodule Signed-off-by: soer3n <[email protected]> kubevirt resources and vcpus should only be parsed wihtout specified instance type Signed-off-by: soer3n <[email protected]>
1 parent 1815216 commit ce286aa

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkg/cloudprovider/provider/kubevirt/provider.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,11 @@ func (p *provider) getConfig(provSpec clusterv1alpha1.ProviderSpec) (*Config, *p
286286
return nil, nil, fmt.Errorf(`failed to get value of "memory" field: %w`, err)
287287
}
288288

289-
config.Resources, config.VCPUs, err = parseResources(cpus, memory, rawConfig.VirtualMachine.Template.VCPUs)
290-
if err != nil {
291-
return nil, nil, fmt.Errorf(`failed to configure resource requests and limits and vcpus: %w`, err)
289+
if rawConfig.VirtualMachine.Instancetype == nil {
290+
config.Resources, config.VCPUs, err = parseResources(cpus, memory, rawConfig.VirtualMachine.Template.VCPUs)
291+
if err != nil {
292+
return nil, nil, fmt.Errorf(`failed to configure resource requests and limits and vcpus: %w`, err)
293+
}
292294
}
293295

294296
config.Namespace = getNamespace()
@@ -630,11 +632,11 @@ func (p *provider) Validate(ctx context.Context, _ *zap.SugaredLogger, spec clus
630632
return fmt.Errorf("no resource requests set for the virtual machine")
631633
}
632634

633-
if c.VCPUs == nil && c.Resources.Cpu() == nil {
635+
if c.VCPUs == nil && c.Resources.Cpu().IsZero() {
634636
return fmt.Errorf("no CPUs configured. Either vCPUs or CPUs have to be set")
635637
}
636638

637-
if c.VCPUs != nil && c.Resources.Cpu() != nil {
639+
if c.VCPUs != nil && !c.Resources.Cpu().IsZero() {
638640
return fmt.Errorf("vCPUs and CPUs cannot be configured at the same time")
639641
}
640642
}

0 commit comments

Comments
 (0)