chore: remove refs to deprecated io/ioutil

cmd/cri-resmgr-webhook/handlers.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 
@@ -75,7 +75,7 @@ func stringify(r interface{}) string {
 func handle(w http.ResponseWriter, r *http.Request) {
 	var body []byte
 	if r.Body != nil {
-		if data, err := ioutil.ReadAll(r.Body); err == nil {
+		if data, err := io.ReadAll(r.Body); err == nil {
 			body = data
 		}
 	}

pkg/avx/collector.go

@@ -22,7 +22,7 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -110,7 +110,7 @@ type collector struct {
 
 func enablePerfTracepoint(prog *bpf.Program, tracepoint string) (int, error) {
 
-	id, err := ioutil.ReadFile(filepath.Join(kernelTracepointPath, tracepoint, "id"))
+	id, err := os.ReadFile(filepath.Join(kernelTracepointPath, tracepoint, "id"))
 	if err != nil {
 		return -1, errors.Wrap(err, "unable to read tracepoint ID")
 	}

pkg/avx/elfdump.go

@@ -22,7 +22,6 @@ package main
 import (
 	"encoding/hex"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"text/template"
@@ -37,7 +36,7 @@ type Program struct {
 }
 
 func main() {
-	f, err := ioutil.ReadFile("../../libexec/avx512.o")
+	f, err := os.ReadFile("../../libexec/avx512.o")
 	if err != nil {
 		fmt.Println("Note: AVX512 eBPF ELF not available.")
 	}

pkg/blockio/blockio.go

@@ -18,7 +18,6 @@ package blockio
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -153,7 +152,7 @@ func getCurrentIOSchedulers() (map[string]string, error) {
 	}
 	for _, schedulerFile := range schedulerFiles {
 		devName := strings.SplitN(schedulerFile, "/", 5)[3]
-		schedulerDataB, err := ioutil.ReadFile(schedulerFile)
+		schedulerDataB, err := os.ReadFile(schedulerFile)
 		if err != nil {
 			// A block device may be disconnected. Continue without error.
 			log.Error("failed to read current IO scheduler %#v: %v\n", schedulerFile, err)

pkg/cgroups/cgroupblkio.go

@@ -16,7 +16,6 @@ package cgroups
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -342,7 +341,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
 }
 

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/config/data.go

@@ -16,7 +16,7 @@ package config
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"sigs.k8s.io/yaml"
 	"strings"
 )
@@ -52,7 +52,7 @@ func DataFromStringMap(smap map[string]string) (Data, error) {
 
 // DataFromFile unmarshals the content of the given file into configuration data.
 func DataFromFile(path string) (Data, error) {
-	raw, err := ioutil.ReadFile(path)
+	raw, err := os.ReadFile(path)
 	if err != nil {
 		return nil, configError("failed to read file %q: %v", path, err)
 	}

pkg/cpuallocator/cpuallocator_test.go

@@ -15,7 +15,6 @@
 package cpuallocator
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -28,7 +27,7 @@ import (
 
 func TestAllocatorHelper(t *testing.T) {
 	// Create tmpdir and decompress testdata there
-	tmpdir, err := ioutil.TempDir("", "cri-resource-manager-test-")
+	tmpdir, err := os.MkdirTemp("", "cri-resource-manager-test-")
 	if err != nil {
 		t.Fatalf("failed to create tmpdir: %v", err)
 	}

pkg/cri/resource-manager/cache/cache.go

@@ -18,7 +18,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -1532,7 +1531,7 @@ func (cch *cache) Save() error {
 	}
 
 	tmpPath := cch.filePath + ".saving"
-	if err = ioutil.WriteFile(tmpPath, data, cacheFilePerm.prefer); err != nil {
+	if err = os.WriteFile(tmpPath, data, cacheFilePerm.prefer); err != nil {
 		return cacheError("failed to write cache to file %q: %v", tmpPath, err)
 	}
 	if err := os.Rename(tmpPath, cch.filePath); err != nil {
@@ -1547,7 +1546,7 @@ func (cch *cache) Save() error {
 func (cch *cache) Load() error {
 	cch.Debug("loading cache from file '%s'...", cch.filePath)
 
-	data, err := ioutil.ReadFile(cch.filePath)
+	data, err := os.ReadFile(cch.filePath)
 
 	switch {
 	case os.IsNotExist(err):

pkg/cri/resource-manager/cache/cache_test.go

@@ -16,7 +16,6 @@ package cache
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -52,7 +51,7 @@ type fakeContainer struct {
 }
 
 func createTmpCache() (Cache, string, error) {
-	dir, err := ioutil.TempDir("", "cache-test")
+	dir, err := os.MkdirTemp("", "cache-test")
 	if err != nil {
 		return nil, "", err
 	}

pkg/cri/resource-manager/cache/utils.go

@@ -15,7 +15,6 @@
 package cache
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"strconv"
@@ -139,7 +138,7 @@ func getMemoryCapacity() int64 {
 		return memoryCapacity
 	}
 
-	if data, err = ioutil.ReadFile("/proc/meminfo"); err != nil {
+	if data, err = os.ReadFile("/proc/meminfo"); err != nil {
 		return -1
 	}
 

pkg/cri/resource-manager/control/page-migrate/demoter.go

@@ -18,7 +18,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"strconv"
@@ -243,7 +242,7 @@ func (d *demoter) startDirtyBitResetTimer() {
 func resetDirtyBit(pid string) error {
 	// Write magic value "4" to the clear_refs file. This resets the dirty bit.
 	path := "/proc/" + pid + "/clear_refs"
-	err := ioutil.WriteFile(path, []byte("4"), 0600)
+	err := os.WriteFile(path, []byte("4"), 0600)
 	return err
 }
 
@@ -328,13 +327,13 @@ func (d *demoter) getPagesForContainer(c *container, sourceNodes idset.IDSet) (p
 		pidNumber := int(pidNumber64)
 		// Read /proc/pid/numa_maps and /proc/pid/maps
 		numaMapsPath := "/proc/" + pid + "/numa_maps"
-		numaMapsBytes, err := ioutil.ReadFile(numaMapsPath)
+		numaMapsBytes, err := os.ReadFile(numaMapsPath)
 		if err != nil {
 			log.Error("Could not read numa_maps: %v", err)
 			continue
 		}
 		mapsPath := "/proc/" + pid + "/maps"
-		mapsBytes, err := ioutil.ReadFile(mapsPath)
+		mapsBytes, err := os.ReadFile(mapsPath)
 		if err != nil {
 			log.Error("Could not read maps: %v\n", err)
 			os.Exit(1)

pkg/cri/resource-manager/policy/builtin/static-pools/config.go

@@ -18,7 +18,7 @@ package stp
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path"
 	"regexp"
 	"strconv"
@@ -124,7 +124,7 @@ func parseConfData(raw []byte) (pools, error) {
 
 func readConfFile(filepath string) (pools, error) {
 	// Read config data
-	data, err := ioutil.ReadFile(filepath)
+	data, err := os.ReadFile(filepath)
 	if err != nil {
 		return nil, stpError("Failed to read config file: %v", err)
 	}
@@ -137,7 +137,7 @@ func readConfDir(confDir string) (pools, error) {
 
 	// List pools in the pools configuration directory
 	poolsDir := path.Join(confDir, "pools")
-	pools, err := ioutil.ReadDir(poolsDir)
+	pools, err := os.ReadDir(poolsDir)
 	if err != nil {
 		return nil, stpError("Failed to list pools config directory %s: %v", poolsDir, err)
 	}
@@ -159,7 +159,7 @@ func readPoolConfDir(poolDir string) (poolConfig, error) {
 	conf := poolConfig{Exclusive: false, CPULists: []*cpuList{}}
 
 	// Read pool's exclusivity flag
-	exclusive, err := ioutil.ReadFile(path.Join(poolDir, "exclusive"))
+	exclusive, err := os.ReadFile(path.Join(poolDir, "exclusive"))
 	if err != nil {
 		return conf, fmt.Errorf("Failed to read pool exclusive setting in %s: %v", poolDir, err)
 	}
@@ -168,7 +168,7 @@ func readPoolConfDir(poolDir string) (poolConfig, error) {
 	}
 
 	// Read socket configurations (per-socket cpu lists)
-	files, err := ioutil.ReadDir(poolDir)
+	files, err := os.ReadDir(poolDir)
 	if err != nil {
 		return conf, fmt.Errorf("Failed to list pool config directory %s: %v", poolDir, err)
 	}
@@ -199,7 +199,7 @@ func readSocketConfDir(socketDir string) ([]*cpuList, error) {
 	}
 
 	// Socket directory contains a set of subdirectories, one per cpu list
-	cpuListDirs, err := ioutil.ReadDir(socketDir)
+	cpuListDirs, err := os.ReadDir(socketDir)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to list socket directory %s: %v", socketDir, err)
 	}

pkg/cri/resource-manager/policy/builtin/static-pools/stp-policy.go

@@ -17,7 +17,7 @@ package stp
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -422,7 +422,7 @@ func parseCmkCmdline(args []string) *cmkLegacyArgs {
 
 	// Create parser
 	cmkCmd := flag.NewFlagSet("cmk-legacy", flag.ContinueOnError)
-	cmkCmd.SetOutput(ioutil.Discard)
+	cmkCmd.SetOutput(io.Discard)
 	cmkCmd.StringVar(&parsedArgs.Pool, "pool", "", "pool to use")
 	cmkCmd.Int64Var(&parsedArgs.SocketID, "socket-id", -1, "socket id to use")
 	cmkCmd.BoolVar(&parsedArgs.NoAffinity, "no-affinity", false, "Do not set cpu affinity before forking the child command")

pkg/cri/resource-manager/policy/builtin/topology-aware/pools_test.go

@@ -16,7 +16,6 @@ package topologyaware
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -286,7 +285,7 @@ func TestPoolCreation(t *testing.T) {
 	// Test pool creation with "real" sysfs data.
 
 	// Create a temporary directory for the test data.
-	dir, err := ioutil.TempDir("", "cri-resource-manager-test-sysfs-")
+	dir, err := os.MkdirTemp("", "cri-resource-manager-test-sysfs-")
 	if err != nil {
 		panic(err)
 	}
@@ -437,7 +436,7 @@ func TestWorkloadPlacement(t *testing.T) {
 	// server system.
 
 	// Create a temporary directory for the test data.
-	dir, err := ioutil.TempDir("", "cri-resource-manager-test-sysfs-")
+	dir, err := os.MkdirTemp("", "cri-resource-manager-test-sysfs-")
 	if err != nil {
 		panic(err)
 	}
@@ -554,7 +553,7 @@ func TestContainerMove(t *testing.T) {
 	// to be moved upwards in the tree.
 
 	// Create a temporary directory for the test data.
-	dir, err := ioutil.TempDir("", "cri-resource-manager-test-sysfs-")
+	dir, err := os.MkdirTemp("", "cri-resource-manager-test-sysfs-")
 	if err != nil {
 		panic(err)
 	}
@@ -720,7 +719,7 @@ func TestAffinities(t *testing.T) {
 	//
 
 	// Create a temporary directory for the test data.
-	dir, err := ioutil.TempDir("", "cri-resource-manager-test-sysfs-")
+	dir, err := os.MkdirTemp("", "cri-resource-manager-test-sysfs-")
 	if err != nil {
 		panic(err)
 	}

pkg/cri/resource-manager/policy/flags.go

@@ -17,7 +17,6 @@ package policy
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -187,7 +186,7 @@ func (cs *ConstraintSet) parseCPUFromCgroup(dir string) error {
 		// dir is none of the previous
 		return policyError("failed to find cpuset.cpus for CPU cgroup constraint %q", dir)
 	}
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		return policyError("failed read CPU cpuset cgroup constraint %q: %v",
 			path, err)

pkg/instrumentation/http/http_test.go

@@ -16,7 +16,7 @@ package http
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 )
@@ -66,7 +66,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)
 	}