update the vfToSkip

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
k8snetworkplumbingwg · Sep 29, 2022 · dd7cb7d · dd7cb7d
1 parent 7e64a88
commit dd7cb7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pkg/plugins/generic/generic_plugin.go b/pkg/plugins/generic/generic_plugin.go
@@ -100,11 +100,7 @@ func (p *GenericPlugin) Apply() error {
 	for _, ifaceStatus := range p.DesireState.Status.Interfaces {
 		for _, iface := range p.DesireState.Spec.Interfaces {
 			if iface.PciAddress == ifaceStatus.PciAddress {
-				skip, err := utils.SkipConfigVf(iface, ifaceStatus)
-				if err != nil {
-					glog.Errorf("generic-plugin Apply(): fail to check for skip VFs %s: %v.", iface.PciAddress, err)
-					return err
-				}
+				skip := utils.SkipConfigVf(iface, ifaceStatus)
 				vfsToSkip[iface.PciAddress] = skip
 				break
 			}
@@ -120,7 +116,7 @@ func (p *GenericPlugin) Apply() error {
 		defer exit()
 	}
 
-	if err := utils.SyncNodeState(p.DesireState); err != nil {
+	if err := utils.SyncNodeState(p.DesireState, vfsToSkip); err != nil {
 		return err
 	}
 	p.LastState = &sriovnetworkv1.SriovNetworkNodeState{}

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -146,7 +146,7 @@ func DiscoverSriovDevices(withUnsupported bool) ([]sriovnetworkv1.InterfaceExt,
 
 // SyncNodeState Attempt to update the node state to match the desired state
 //
-func SyncNodeState(newState *sriovnetworkv1.SriovNetworkNodeState) error {
+func SyncNodeState(newState *sriovnetworkv1.SriovNetworkNodeState, vfsToConfig map[string]bool) error {
 	return ConfigSriovInterfaces(newState.Spec.Interfaces, newState.Status.Interfaces, vfsToConfig)
 }