Merge pull request #295 from rollandf/deadcode

Fix deadcode and goimports issues
k8snetworkplumbingwg · May 17, 2022 · 7c829e3 · 7c829e3
2 parents 4af8372 + b905cab
commit 7c829e3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 11 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -55,7 +55,6 @@ const (
 	testNamespace = "openshift-sriov-network-operator"
 
 	timeout  = time.Second * 10
-	duration = time.Second * 100
 	interval = time.Millisecond * 250
 )
 

diff --git a/pkg/render/render.go b/pkg/render/render.go
@@ -40,7 +40,6 @@ const (
 	filesDir          = "files"
 	ovsUnitsDir       = "ovs-units"
 	switchdevUnitsDir = "switchdev-units"
-	platformBase      = "bindata/manifests/machine-config"
 )
 
 func MakeRenderData() RenderData {

diff --git a/pkg/utils/shutdown.go b/pkg/utils/shutdown.go
@@ -6,7 +6,6 @@ import (
 	snclientset "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/client/clientset/versioned"
 	admv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -17,12 +16,6 @@ import (
 
 var shutdownLog = ctrl.Log.WithName("shutdown")
 
-var sriovnetworksGVR = schema.GroupVersionResource{
-	Group:    "sriovnetwork.openshift.io",
-	Version:  "v1",
-	Resource: "sriovnetworks",
-}
-
 var failurePolicyIgnore = admv1.Ignore
 
 func Shutdown() {

diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/golang/glog"
-	"k8s.io/api/admission/v1"
+	v1 "k8s.io/api/admission/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"

diff --git a/test/e2e/e2e_tests_suite_test.go b/test/e2e/e2e_tests_suite_test.go
@@ -39,7 +39,6 @@ var doneNetNsSet chan error
 // Define utility constants for object names and testing timeouts/durations and intervals.
 const (
 	timeout         = time.Second * 30
-	duration        = time.Second * 300
 	interval        = time.Second * 1
 	devPollInterval = time.Millisecond * 400
 )