Merge branch 'main' into fixes/golangci-lint/topology-aware

cmd/plugins/memory-qos/main.go

@@ -32,7 +32,6 @@ import (
 
 type plugin struct {
 	stub   stub.Stub
-	mask   stub.EventMask
 	config *pluginConfig
 }
 
@@ -216,7 +215,7 @@ func (p *plugin) CreateContainer(ctx context.Context, pod *api.PodSandbox, ctr *
 				return nil, nil, errWithContext
 			}
 			class = value
-		case sliceContains(p.config.UnifiedAnnotations, annPrefix) == true:
+		case sliceContains(p.config.UnifiedAnnotations, annPrefix):
 			unified[annPrefix] = value
 			log.Tracef("applying unified annotation %q resulted in unified=%v", annPrefix, unified)
 		default:

cmd/plugins/memtierd/main.go

@@ -36,7 +36,6 @@ import (
 
 type plugin struct {
 	stub           stub.Stub
-	mask           stub.EventMask
 	config         *pluginConfig
 	cgroupsDir     string
 	ctrMemtierdEnv map[string]*memtierdEnv
@@ -73,7 +72,6 @@ type qosClass struct {
 }
 
 type memtierdEnv struct {
-	pid        int
 	ctrDir     string
 	configFile string
 	outputFile string
@@ -314,7 +312,11 @@ func (p *plugin) StopContainer(ctx context.Context, pod *api.PodSandbox, ctr *ap
 			log.Debugf("StopContainer: killing memtierd of %s (pid: %d) failed: %s", ppName, pid, err)
 		}
 		// Close files, read exit status (leave no zombie processes behind)
-		go mtdEnv.cmd.Wait()
+		go func() {
+			if err := mtdEnv.cmd.Wait(); err != nil {
+				log.Errorf("StopContainer: waiting for memtierd of %s (pid: %d) failed: %s", ppName, pid, err)
+			}
+		}()
 	}
 
 	log.Tracef("StopContainer: removing memtierd run directory %s", mtdEnv.ctrDir)
@@ -438,9 +440,11 @@ func (me *memtierdEnv) startMemtierd() error {
 		return fmt.Errorf("failed to start command %s: %q", cmd, err)
 	}
 	if cmd.Process != nil {
-		os.WriteFile(me.pidFile,
+		if err := os.WriteFile(me.pidFile,
 			[]byte(fmt.Sprintf("%d\n", cmd.Process.Pid)),
-			0400)
+			0400); err != nil {
+			log.Warnf("failed to write PID file %q: %s", me.pidFile, err)
+		}
 	}
 	me.cmd = cmd
 	return nil

cmd/plugins/template/policy/template-policy.go

@@ -131,17 +131,10 @@ func (p *policy) ExportResourceData(c cache.Container) map[string]string {
 	return nil
 }
 
-// Initialize or reinitialize the policy.
-func (p *policy) initialize() error {
-	return nil
-}
-
 type NoMetrics struct{}
 
 func (*NoMetrics) Describe(chan<- *prometheus.Desc) {
-	return
 }
 
 func (*NoMetrics) Collect(chan<- prometheus.Metric) {
-	return
 }

pkg/agent/agent.go

@@ -212,10 +212,10 @@ func (a *Agent) Start(notifyFn NotifyFn) error {
 				break
 			}
 			if e.Type == watch.Added || e.Type == watch.Modified {
-				group, _ := e.Object.(*corev1.Node).Labels[a.groupLabel]
+				group := e.Object.(*corev1.Node).Labels[a.groupLabel]
 				if group == "" {
 					for _, l := range deprecatedGroupLabels {
-						group, _ = e.Object.(*corev1.Node).Labels[l]
+						group = e.Object.(*corev1.Node).Labels[l]
 						if group != "" {
 							log.Warnf("Using DEPRECATED config group label %q", l)
 							log.Warnf("Please switch to using label %q instead", a.groupLabel)
@@ -259,7 +259,7 @@ func (a *Agent) Stop() {
 
 	if a.stopC != nil {
 		close(a.stopC)
-		_ = <-a.doneC
+		<-a.doneC
 		a.stopC = nil
 	}
 }

pkg/agent/podresapi/client.go

@@ -17,9 +17,7 @@ package podresapi
 import (
 	"context"
 	"fmt"
-	"net"
 	"strings"
-	"time"
 
 	logger "github.com/containers/nri-plugins/pkg/log"
 	"google.golang.org/grpc"
@@ -43,7 +41,6 @@ const (
 	// these constants were obtained from NFD sources, cross-checked against
 	//   https://github.com/kubernetes/kubernetes/blob/release-1.31/test/e2e_node/util.go#L83
 	defaultSocketPath = "/var/lib/kubelet/pod-resources/kubelet.sock"
-	timeout           = 10 * time.Second
 	maxSize           = 1024 * 1024 * 16
 )
 
@@ -77,20 +74,9 @@ func NewClient(options ...ClientOption) (*Client, error) {
 	}
 
 	if c.conn == nil {
-		ctx, cancel := context.WithTimeout(context.Background(), timeout)
-		defer cancel()
-
-		dialer := func(ctx context.Context, addr string) (net.Conn, error) {
-			return (&net.Dialer{}).DialContext(ctx, "unix", addr)
-		}
-
-		conn, err := grpc.DialContext(
-			ctx,
-			c.socketPath,
+		conn, err := grpc.NewClient("unix://"+c.socketPath,
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
-			grpc.WithContextDialer(dialer),
 			grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxSize)),
-			grpc.WithBlock(),
 		)
 
 		if err != nil {

pkg/agent/watch/file.go

@@ -87,7 +87,7 @@ func (w *FileWatch) Stop() {
 
 	if w.stopC != nil {
 		close(w.stopC)
-		_ = <-w.doneC
+		<-w.doneC
 		w.stopC = nil
 	}
 }

pkg/agent/watch/object.go

@@ -38,7 +38,6 @@ type ObjectWatch struct {
 	name      string
 	resultC   chan Event
 	wif       watch.Interface
-	pending   *Event
 	reopenC   <-chan time.Time
 	failing   bool
 
@@ -73,7 +72,7 @@ func (w *ObjectWatch) Stop() {
 
 	if w.stopC != nil {
 		close(w.stopC)
-		_ = <-w.doneC
+		<-w.doneC
 		w.stopC = nil
 	}
 }

pkg/apis/config/v1alpha1/resmgr/control/config.go

@@ -21,5 +21,5 @@ import (
 // +k8s:deepcopy-gen=true
 type Config struct {
 	// +optional
-	CPU *cpu.Config `json:"cpu",omitempty"`
+	CPU *cpu.Config `json:"cpu,omitempty"`
 }

pkg/apis/resmgr/v1alpha1/expression.go

@@ -46,15 +46,15 @@ func (e *Expression) Validate() error {
 			return exprError("invalid expression, '%s' requires a single value", e.Op)
 		}
 	case Exists, NotExist:
-		if e.Values != nil && len(e.Values) != 0 {
+		if len(e.Values) != 0 {
 			return exprError("invalid expression, '%s' does not take any values", e.Op)
 		}
 
 	case In, NotIn:
 	case MatchesAny, MatchesNone:
 
 	case AlwaysTrue:
-		if e.Values != nil && len(e.Values) != 0 {
+		if len(e.Values) != 0 {
 			return exprError("invalid expression, '%s' does not take any values", e.Op)
 		}
 

pkg/cgroups/cgroupblkio.go

@@ -17,7 +17,6 @@ package cgroups
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -341,7 +340,7 @@ var currentPlatform platformInterface = defaultPlatform{}
 
 // readFromFile returns file contents as a string.
 func (dpm defaultPlatform) readFromFile(filename string) (string, error) {
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	return string(content), err
 }
 
@@ -352,6 +351,6 @@ func (dpm defaultPlatform) writeToFile(filename string, content string) error {
 		return err
 	}
 	defer f.Close()
-	_, err = fmt.Fprintf(f, content)
+	_, err = fmt.Fprintf(f, "%s", content)
 	return err
 }

pkg/cgroups/cgroupstats.go

@@ -16,7 +16,7 @@ package cgroups
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path"
 	"path/filepath"
 	"strconv"
@@ -89,7 +89,7 @@ type GlobalNumaStats struct {
 
 func readCgroupFileLines(filePath string) ([]string, error) {
 
-	f, err := ioutil.ReadFile(filePath)
+	f, err := os.ReadFile(filePath)
 
 	if err != nil {
 		return nil, err

pkg/cgroupstats/collector.go

@@ -282,7 +282,7 @@ func walkCgroups() []string {
 	containerDirs := []string{}
 
 	cpuset := filepath.Join(cgroupRoot, "cpuset")
-	filepath.Walk(filepath.Join(cpuset, kubepodsDir),
+	err := filepath.Walk(filepath.Join(cpuset, kubepodsDir),
 		func(path string, info os.FileInfo, err error) error {
 			if err != nil {
 				if os.IsNotExist(err) {
@@ -315,6 +315,9 @@ func walkCgroups() []string {
 
 			return nil
 		})
+	if err != nil {
+		log.Warnf("cgroupfs walk failed: %v", err)
+	}
 
 	return containerDirs
 }

pkg/cpuallocator/allocator.go

@@ -57,9 +57,6 @@ type allocatorHelper struct {
 	prefer        CPUPriority   // CPU priority to prefer
 	cnt           int           // number of CPUs to allocate
 	result        cpuset.CPUSet // set of CPUs allocated
-
-	pkgs []sysfs.CPUPackage // physical CPU packages, sorted by preference
-	cpus []sysfs.CPU        // CPU cores, sorted by preference
 }
 
 // CPUAllocator is an interface for a generic CPU allocator
@@ -942,7 +939,6 @@ func (a *allocatorHelper) takeCacheGroups() {
 	a.result = result
 	a.from = from
 	a.cnt = 0
-	return
 }
 
 // Allocate full idle CPU cores.

pkg/cpuallocator/cpuallocator_test.go

@@ -15,7 +15,6 @@
 package cpuallocator
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -30,7 +29,7 @@ import (
 
 func TestAllocatorHelper(t *testing.T) {
 	// Create tmpdir and decompress testdata there
-	tmpdir, err := ioutil.TempDir("", "nri-resource-policy-test-")
+	tmpdir, err := os.MkdirTemp("", "nri-resource-policy-test-")
 	if err != nil {
 		t.Fatalf("failed to create tmpdir: %v", err)
 	}
@@ -108,7 +107,7 @@ func TestClusteredAllocation(t *testing.T) {
 	}
 
 	// Create tmpdir and decompress testdata there
-	tmpdir, err := ioutil.TempDir("", "nri-resource-policy-test-")
+	tmpdir, err := os.MkdirTemp("", "nri-resource-policy-test-")
 	if err != nil {
 		t.Fatalf("failed to create tmpdir: %v", err)
 	}
@@ -324,7 +323,7 @@ func TestClusteredCoreKindAllocation(t *testing.T) {
 	}
 
 	// Create tmpdir and decompress testdata there
-	tmpdir, err := ioutil.TempDir("", "nri-resource-policy-test-")
+	tmpdir, err := os.MkdirTemp("", "nri-resource-policy-test-")
 	if err != nil {
 		t.Fatalf("failed to create tmpdir: %v", err)
 	}

pkg/healthz/healthz.go

@@ -54,14 +54,20 @@ func serve(w http.ResponseWriter, req *http.Request) {
 	status, details := check()
 	if status == Healthy {
 		w.WriteHeader(200)
-		w.Write([]byte("ok"))
+		_, err := w.Write([]byte("ok"))
+		if err != nil {
+			log.Errorf("failed to write response: %v", err)
+		}
 	} else {
 		errors := ""
 		for _, err := range details {
 			errors += fmt.Sprintf("%v\n", err)
 		}
 		w.WriteHeader(500)
-		w.Write([]byte(errors))
+		_, err := w.Write([]byte(errors))
+		if err != nil {
+			log.Errorf("failed to write response: %v", err)
+		}
 	}
 }
 

pkg/http/http.go

@@ -161,7 +161,12 @@ func (s *Server) Start(addr string) error {
 		s.server.Addr = ln.Addr().String()
 	}
 
-	go s.server.Serve(ln)
+	go func() {
+		err := s.server.Serve(ln)
+		if err != nil && err != http.ErrServerClosed {
+			log.Warn("HTTP server exited with error: %v", err)
+		}
+	}()
 
 	return nil
 }
@@ -200,8 +205,10 @@ func (s *Server) Shutdown(wait bool) {
 			close(sync)
 		})
 	}
-	s.server.Shutdown(context.Background())
-	_ = <-sync
+	if err := s.server.Shutdown(context.Background()); err != nil && err != http.ErrServerClosed {
+		log.Warnf("failed to shutdown server: %v", err)
+	}
+	<-sync
 
 	s.server = nil
 }

pkg/http/http_test.go

@@ -16,7 +16,7 @@ package http
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 )
@@ -48,12 +48,6 @@ func TestStartStop(t *testing.T) {
 	srv.Stop()
 }
 
-type urlTest struct {
-	pattern  string
-	response string
-	fallback string
-}
-
 func checkURL(t *testing.T, srv *Server, path, response string, status int) {
 	url := "http://" + srv.GetAddress() + path
 
@@ -66,7 +60,7 @@ func checkURL(t *testing.T, srv *Server, path, response string, status int) {
 		t.Errorf("http.Get(%s) status %d, expected %d", url, res.StatusCode, status)
 	}
 
-	txt, err := ioutil.ReadAll(res.Body)
+	txt, err := io.ReadAll(res.Body)
 	if err != nil {
 		t.Errorf("http.Get(%s) failed to read response: %v", url, err)
 	}