Slash and burn unused code

.. guided by `honnef.co/go/tools/cmd/staticcheck` and
`staticcheck -unused.whole-program -tests ./...`

pkg/awsutils/awsutils.go

@@ -164,7 +164,6 @@ type EC2InstanceMetadataCache struct {
 	localIPv4        string
 	instanceID       string
 	instanceType     string
-	vpcIPv4CIDR      string
 	vpcIPv4CIDRs     StringSet
 	primaryENI       string
 	primaryENImac    string

pkg/cninswrapper/generate_mocks.go

@@ -13,5 +13,4 @@
 
 package cninswrapper
 
-//go:generate go run github.com/golang/mock/mockgen -destination mocks/cninswrapper_mocks.go -copyright_file ../../scripts/copyright.txt . NS
 //go:generate go run github.com/golang/mock/mockgen -destination mock_ns/netns_mocks.go -copyright_file ../../scripts/copyright.txt github.com/containernetworking/plugins/pkg/ns NetNS

pkg/k8sapi/discovery.go

@@ -34,11 +34,6 @@ const (
 	cniPodName = "aws-node"
 )
 
-// K8SAPIs defines interface to use kubelet introspection API
-type K8SAPIs interface {
-	K8SGetLocalPodIPs() ([]*K8SPodInfo, error)
-}
-
 // K8SPodInfo provides pod info
 type K8SPodInfo struct {
 	// Name is pod's name
@@ -54,9 +49,6 @@ type K8SPodInfo struct {
 
 var log = logger.Get()
 
-// ErrInformerNotSynced indicates that it has not synced with API server yet
-var ErrInformerNotSynced = errors.New("discovery: informer not synced")
-
 // Controller defines global context for discovery controller
 type Controller struct {
 	workerPods     map[string]*K8SPodInfo
@@ -162,28 +154,6 @@ func (d *Controller) DiscoverK8SPods(podListWatcher *cache.ListWatch) {
 	select {}
 }
 
-// K8SGetLocalPodIPs return the list of pods running on the local nodes
-func (d *Controller) K8SGetLocalPodIPs() ([]*K8SPodInfo, error) {
-	var localPods []*K8SPodInfo
-
-	if !d.synced {
-		log.Info("GetLocalPods: informer not synced yet")
-		return nil, ErrInformerNotSynced
-	}
-
-	log.Debug("GetLocalPods start ...")
-	d.workerPodsLock.Lock()
-	defer d.workerPodsLock.Unlock()
-
-	for _, pod := range d.workerPods {
-		log.Infof("K8SGetLocalPodIPs discovered local Pods: %s %s %s %s",
-			pod.Name, pod.Namespace, pod.IP, pod.UID)
-		localPods = append(localPods, pod)
-	}
-
-	return localPods, nil
-}
-
 // The rest of logic/code are taken from kubernetes/client-go/examples/workqueue
 func newController(queue workqueue.RateLimitingInterface, indexer cache.Indexer, informer cache.Controller) *controller {
 	return &controller{

pkg/netlinkwrapper/netlink.go

@@ -166,23 +166,3 @@ func IsNotExistsError(err error) bool {
 	}
 	return false
 }
-
-// IsRouteExistsError returns true if the error type is syscall.EEXIST
-// This helps us determine if we should ignore this error as the route
-// we want to add has been added already in routing table
-func IsRouteExistsError(err error) bool {
-	if errno, ok := err.(syscall.Errno); ok {
-		return errno == syscall.EEXIST
-	}
-	return false
-}
-
-// IsNetworkUnreachableError returns true if the error type is syscall.ENETUNREACH
-// This helps us determine if we should ignore this error as the route the call
-// depends on is not plumbed ready yet
-func IsNetworkUnreachableError(err error) bool {
-	if errno, ok := err.(syscall.Errno); ok {
-		return errno == syscall.ENETUNREACH
-	}
-	return false
-}

pkg/utils/retry/errors.go

@@ -13,11 +13,6 @@
 
 package retry
 
-import (
-	"fmt"
-	"strings"
-)
-
 type Retriable interface {
 	Retry() bool
 }
@@ -52,25 +47,3 @@ func NewRetriableError(retriable Retriable, err error) RetriableError {
 		err,
 	}
 }
-
-type AttributeError struct {
-	err string
-}
-
-func (e AttributeError) Error() string {
-	return e.err
-}
-
-// MultiErr Implements error
-type MultiErr struct {
-	errors []error
-}
-
-func (me MultiErr) Error() string {
-	ret := make([]string, len(me.errors)+1)
-	ret[0] = "Multiple error:"
-	for ndx, err := range me.errors {
-		ret[ndx+1] = fmt.Sprintf("\t%d: %s", ndx, err.Error())
-	}
-	return strings.Join(ret, "\n")
-}

pkg/utils/ttime/ttime.go

@@ -19,8 +19,6 @@ type Timer interface {
 // DefaultTime is a Time that behaves normally
 type DefaultTime struct{}
 
-var _time Time = &DefaultTime{}
-
 // Now returns the current time
 func (*DefaultTime) Now() time.Time {
 	return time.Now()
@@ -42,19 +40,3 @@ func (*DefaultTime) After(d time.Duration) <-chan time.Time {
 func (*DefaultTime) AfterFunc(d time.Duration, f func()) Timer {
 	return time.AfterFunc(d, f)
 }
-
-// SetTime configures what 'Time' implementation to use for each of the
-// package-level methods.
-func SetTime(t Time) {
-	_time = t
-}
-
-// Now returns the implementation's current time
-func Now() time.Time {
-	return _time.Now()
-}
-
-// Since returns the time different from Now and the given time t
-func Since(t time.Time) time.Duration {
-	return _time.Now().Sub(t)
-}