k8snetworkplumbingwg · SchSeba · May 17, 2022 · Apr 27, 2022
diff --git a/cmd/webhook/start.go b/cmd/webhook/start.go
@@ -209,5 +209,4 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 			glog.Infof("watcher error: %v", err)
 		}
 	}
-
 }
diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go
@@ -118,7 +118,6 @@ func (r *SriovNetworkNodePolicyReconciler) Reconcile(ctx context.Context, req ct
 	if len(defaultOpConf.Spec.ConfigDaemonNodeSelector) > 0 {
 		labels := client.MatchingLabels(defaultOpConf.Spec.ConfigDaemonNodeSelector)
 		lo = &labels
-
 	} else {
 		lo = &client.MatchingLabels{
 			"node-role.kubernetes.io/worker": "",

diff --git a/pkg/apply/merge.go b/pkg/apply/merge.go
@@ -10,7 +10,6 @@ import (
 // This is to be able to do a a meaningful comparison in apply,
 // since objects created on runtime do not have these fields populated.
 func MergeMetadataForUpdate(current, updated *uns.Unstructured) error {
-
 	mergeAnnotations(current, updated)
 	mergeLabels(current, updated)
 	updated.SetResourceVersion(current.GetResourceVersion())
@@ -51,7 +50,6 @@ const (
 func MergeDeploymentForUpdate(current, updated *uns.Unstructured) error {
 	gvk := updated.GroupVersionKind()
 	if gvk.Group == "apps" && gvk.Kind == "Deployment" {
-
 		// Copy over the revision annotation from current up to updated
 		// otherwise, updated would win, and this annotation is "special" and
 		// needs to be preserved

diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -506,7 +506,6 @@ func (dn *Daemon) nodeStateSyncHandler(generation int64) error {
 				done := make(chan bool)
 				go dn.getDrainLock(ctx, done)
 				<-done
-
 			}
 
 			if utils.ClusterType == utils.ClusterTypeOpenshift {

diff --git a/pkg/plugins/mellanox/mellanox_plugin.go b/pkg/plugins/mellanox/mellanox_plugin.go
@@ -351,7 +351,6 @@ func getOtherPortSpec(pciAddress string) *sriovnetworkv1.Interface {
 // handleTotalVfs return required total VFs or max (required VFs for dual port NIC) and needReboot if totalVfs will change
 func handleTotalVfs(fwCurrent, fwNext, attrs *mlnxNic, ifaceSpec sriovnetworkv1.Interface, isDualPort bool) (
 	totalVfs int, needReboot, changeWithoutReboot bool) {
-
 	totalVfs = ifaceSpec.NumVfs
 	// Check if the other port is changing the number of VF
 	if isDualPort {

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -325,7 +325,6 @@ func configSriovDevice(iface *sriovnetworkv1.Interface, ifaceStatus *sriovnetwor
 							glog.Errorf("configSriovDevice(): VF link is not ready for device %s %q", addr, err)
 							return err
 						}
-
 					}
 					if err = setVfAdminMac(addr, pfLink, vfLink); err != nil {
 						glog.Errorf("configSriovDevice(): fail to configure VF admin mac address for device %s %q", addr, err)

diff --git a/pkg/webhook/validate.go b/pkg/webhook/validate.go
@@ -74,13 +74,11 @@ func validateSriovNetworkNodePolicy(cr *sriovnetworkv1.SriovNetworkNodePolicy, o
 	admit, err := staticValidateSriovNetworkNodePolicy(cr)
 	if err != nil {
 		return admit, warnings, err
-
 	}
 
 	admit, err = dynamicValidateSriovNetworkNodePolicy(cr)
 	if err != nil {
 		return admit, warnings, err
-
 	}
 
 	return admit, warnings, nil

diff --git a/test/conformance/test_suite_test.go b/test/conformance/test_suite_test.go
@@ -48,7 +48,6 @@ func TestTest(t *testing.T) {
 		}
 		defer f.Close()
 		rr = append(rr, k8sreporter.New(clients, f))
-
 	} else if *dumpOutput {
 		rr = append(rr, k8sreporter.New(clients, os.Stdout))
 	}

diff --git a/test/conformance/tests/init.go b/test/conformance/tests/init.go
@@ -18,5 +18,4 @@ func init() {
 	}
 
 	clients = testclient.New("")
-
 }
diff --git a/test/conformance/tests/sriov_operator.go b/test/conformance/tests/sriov_operator.go
@@ -1787,7 +1787,6 @@ func findSuitableResourceForMain(mainIntf *sriovv1.InterfaceExt, networkState *s
 	}
 
 	return "", false
-
 }
 
 func resourceOnlyForInterface(networkState *sriovv1.SriovNetworkNodeState, resourceName, interfaceName string) bool {
@@ -1961,7 +1960,6 @@ func daemonsScheduledOnNodes(selector string) bool {
 		}
 	}
 	return true
-
 }
 
 func createSriovPolicy(sriovDevice string, testNode string, numVfs int, resourceName string) {
@@ -2186,6 +2184,5 @@ func setSriovOperatorSpecFlag(flagName string, flagValue bool) {
 
 			return true
 		}, 1*time.Minute, 10*time.Second).Should(BeTrue())
-
 	}
 }
diff --git a/test/util/cluster/cluster.go b/test/util/cluster/cluster.go
@@ -98,7 +98,6 @@ func (n *EnabledNodes) FindOneSriovDevice(node string) (*sriovv1.InterfaceExt, e
 	}
 	for _, itf := range s.Status.Interfaces {
 		if IsPFDriverSupported(itf.Driver) && sriovv1.IsSupportedDevice(itf.DeviceID) {
-
 			// Skip mlx interfaces if secure boot is enabled
 			// TODO: remove this when mlx support secure boot/lockdown mode
 			if itf.Vendor == mlxVendorID && n.IsSecureBootEnabled[node] {

diff --git a/test/util/k8sreporter/reporter.go b/test/util/k8sreporter/reporter.go
@@ -51,7 +51,6 @@ func (r *KubernetesReporter) SpecDidComplete(specSummary *types.SpecSummary) {
 	fmt.Fprintln(r.dumpOutput, "Starting dump for failed spec", specSummary.ComponentTexts)
 	r.Dump()
 	fmt.Fprintln(r.dumpOutput, "Finished dump for failed spec")
-
 }
 
 func (r *KubernetesReporter) Dump() {

diff --git a/test/util/util.go b/test/util/util.go
@@ -58,7 +58,6 @@ func WaitForSriovNetworkNodeStateReady(nodeState *sriovnetworkv1.SriovNetworkNod
 }
 
 func WaitForDaemonSetReady(ds *appsv1.DaemonSet, client client.Client, namespace, name string, retryInterval, timeout time.Duration) error {
-
 	err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
 		ctx, cancel := goctx.WithTimeout(goctx.Background(), ApiTimeout)
 		defer cancel()
@@ -84,7 +83,6 @@ func WaitForDaemonSetReady(ds *appsv1.DaemonSet, client client.Client, namespace
 }
 
 func WaitForNamespacedObject(obj client.Object, client client.Client, namespace, name string, retryInterval, timeout time.Duration) error {
-
 	err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
 		ctx, cancel := goctx.WithTimeout(goctx.Background(), ApiTimeout)
 		defer cancel()
@@ -106,7 +104,6 @@ func WaitForNamespacedObject(obj client.Object, client client.Client, namespace,
 }
 
 func WaitForNamespacedObjectDeleted(obj client.Object, client client.Client, namespace, name string, retryInterval, timeout time.Duration) error {
-
 	err := wait.PollImmediate(retryInterval, timeout, func() (done bool, err error) {
 		ctx, cancel := goctx.WithTimeout(goctx.Background(), ApiTimeout)
 		defer cancel()

diff --git a/test/validation/test_suite_test.go b/test/validation/test_suite_test.go
@@ -46,7 +46,6 @@ func TestTest(t *testing.T) {
 		}
 		defer f.Close()
 		rr = append(rr, k8sreporter.New(clients, f))
-
 	} else if *dumpOutput {
 		rr = append(rr, k8sreporter.New(clients, os.Stdout))
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -209,5 +209,4 @@ func runStartCmd(cmd *cobra.Command, args []string) { @@
     			glog.Infof("watcher error: %v", err)
     		}
     	}
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,5 +18,4 @@ func init() {
		}

		clients = testclient.New("")

		}