Merge pull request #1891 from saschagrunert/lint

k8s-ci-robot · web-flow · commit 7361cbb1c2e3 · 2025-08-18T09:01:11.000-07:00
Update golangci-lint and config
diff --git a/Makefile b/Makefile
@@ -52,7 +52,7 @@ define curl_to
 endef
 
 ZEITGEIST_VERSION = v0.5.3
-GOLANGCI_LINT_VERSION := v2.2.2
+GOLANGCI_LINT_VERSION := v2.4.0
 REPO_INFRA_VERSION = v0.2.5
 
 GINKGO := $(BUILD_BIN_PATH)/ginkgo
diff --git a/cmd/crictl/container.go b/cmd/crictl/container.go
@@ -1127,7 +1127,7 @@ func marshalContainerStatus(cs *pb.ContainerStatus) (string, error) {
 		return "", err
 	}
 
-	jsonMap := make(map[string]interface{})
+	jsonMap := make(map[string]any)
 
 	err = json.Unmarshal([]byte(statusStr), &jsonMap)
 	if err != nil {
diff --git a/cmd/crictl/sandbox.go b/cmd/crictl/sandbox.go
@@ -456,7 +456,7 @@ func marshalPodSandboxStatus(ps *pb.PodSandboxStatus) (string, error) {
 		return "", err
 	}
 
-	jsonMap := make(map[string]interface{})
+	jsonMap := make(map[string]any)
 
 	err = json.Unmarshal([]byte(statusStr), &jsonMap)
 	if err != nil {
diff --git a/cmd/crictl/templates.go b/cmd/crictl/templates.go
@@ -41,7 +41,7 @@ func builtinTmplFuncs() template.FuncMap {
 }
 
 // jsonBuiltinTmplFunc allows to jsonify result of template execution.
-func jsonBuiltinTmplFunc(v interface{}) string {
+func jsonBuiltinTmplFunc(v any) string {
 	o := new(bytes.Buffer)
 
 	enc := json.NewEncoder(o)
@@ -52,15 +52,15 @@ func jsonBuiltinTmplFunc(v interface{}) string {
 	return o.String()
 }
 
-// tmplExecuteRawJSON executes the template with interface{} with decoded by
+// tmplExecuteRawJSON executes the template with any with decoded by
 // rawJSON string.
 func tmplExecuteRawJSON(tmplStr, rawJSON string) (string, error) {
 	dec := json.NewDecoder(
 		bytes.NewReader([]byte(rawJSON)),
 	)
 	dec.UseNumber()
 
-	var raw interface{}
+	var raw any
 	if err := dec.Decode(&raw); err != nil {
 		return "", fmt.Errorf("failed to decode json: %w", err)
 	}
diff --git a/cmd/crictl/util.go b/cmd/crictl/util.go
@@ -489,7 +489,7 @@ func parseLabelStringSlice(ss []string) (map[string]string, error) {
 
 // marshalMapInOrder marshals a map into JSON in the order of the original
 // data structure.
-func marshalMapInOrder(m map[string]interface{}, t interface{}) (string, error) {
+func marshalMapInOrder(m map[string]any, t any) (string, error) {
 	s := "{"
 
 	v := reflect.ValueOf(t)
diff --git a/cmd/critest/cri_test.go b/cmd/critest/cri_test.go
@@ -170,7 +170,7 @@ func runParallelTestSuite(t *testing.T) {
 	args = append(args, tempFileName, "--")
 	args = append(args, testArgs...)
 
-	cmd := exec.Command("ginkgo", args...)
+	cmd := exec.CommandContext(t.Context(), "ginkgo", args...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
@@ -222,7 +222,7 @@ func generateGinkgoRunFlags() ([]string, error) {
 	flags := ginkgotypes.SuiteConfigFlags
 	flags = flags.CopyAppend(ginkgotypes.ReporterConfigFlags...)
 
-	bindings := map[string]interface{}{
+	bindings := map[string]any{
 		"S": &suiteConfig,
 		"R": &reporterConfig,
 	}
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -19,7 +19,7 @@ dependencies:
         match: ZEITGEIST_VERSION
 
   - name: golangci-lint
-    version: v2.2.2
+    version: v2.4.0
     refPaths:
       - path: Makefile
         match: GOLANGCI_LINT_VERSION
@@ -35,3 +35,13 @@ dependencies:
     refPaths:
       - path: hack/release-notes.sh
         match: VERSION
+
+  - name: busybox
+    version: 1.37.0
+    refPaths:
+      - path: images/image-test/Dockerfile
+        match: FROM
+      - path: images/image-user/Dockerfile
+        match: FROM
+      - path: images/image-predefined-group/Dockerfile
+        match: FROM
diff --git a/images/build b/images/build
@@ -26,7 +26,6 @@ ARCHITECTURES=(
     arm64
     ppc64le
     s390x
-    mips64le
 )
 
 # Prepare the system
diff --git a/images/image-predefined-group/Dockerfile b/images/image-predefined-group/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox:1.36.1
+FROM busybox:1.37.0
 
 # User default-user(uid=1000) belongs to
 # group-defined-in-image(gid=50000) group in this image.
diff --git a/images/image-test/Dockerfile b/images/image-test/Dockerfile
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox:1.36.1
+FROM busybox:1.37.0
 ARG TEST
 ADD ${TEST} ${TEST}
diff --git a/images/image-user/Dockerfile b/images/image-user/Dockerfile
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox:1.36.1
+FROM busybox:1.37.0
 ARG USER
 USER ${USER}
diff --git a/pkg/framework/util.go b/pkg/framework/util.go
@@ -163,24 +163,24 @@ func nowStamp() string {
 	return time.Now().Format(time.StampMilli)
 }
 
-func logf(level, format string, args ...interface{}) {
+func logf(level, format string, args ...any) {
 	fmt.Fprintf(GinkgoWriter, nowStamp()+": "+level+": "+format+"\n", args...)
 }
 
 // Logf prints a info message.
-func Logf(format string, args ...interface{}) {
+func Logf(format string, args ...any) {
 	logf("INFO", format, args...)
 }
 
 // Failf prints an error message.
-func Failf(format string, args ...interface{}) {
+func Failf(format string, args ...any) {
 	msg := fmt.Sprintf(format, args...)
 	logf("INFO", msg)
 	Fail(nowStamp()+": "+msg, 1)
 }
 
 // ExpectNoError reports error if err is not nil.
-func ExpectNoError(err error, explain ...interface{}) {
+func ExpectNoError(err error, explain ...any) {
 	if err != nil {
 		Logf("Unexpected error occurred: %v", err)
 	}
@@ -393,7 +393,7 @@ func PullPublicImage(c internalapi.ImageManagerService, imageName string, podCon
 }
 
 // LoadYamlFile attempts to load the given YAML file into the given struct.
-func LoadYamlFile(filepath string, obj interface{}) error {
+func LoadYamlFile(filepath string, obj any) error {
 	Logf("Attempting to load YAML file %q into %+v", filepath, obj)
 
 	fileContent, err := os.ReadFile(filepath)
diff --git a/pkg/validate/apparmor_linux.go b/pkg/validate/apparmor_linux.go
@@ -286,7 +286,7 @@ func loadTestProfiles() error {
 	}
 
 	// load apparmor profiles into kernel.
-	cmd := exec.Command("sudo", "apparmor_parser", "-r", "-W", f.Name())
+	cmd := exec.CommandContext(context.TODO(), "sudo", "apparmor_parser", "-r", "-W", f.Name())
 	stderr := &bytes.Buffer{}
 	cmd.Stderr = stderr
 	out, err := cmd.Output()
diff --git a/pkg/validate/security_context_linux.go b/pkg/validate/security_context_linux.go
@@ -1661,7 +1661,7 @@ func supportsIDMap(path string) error {
 	// So we use just some random mapping, it doesn't really matter which one.
 	// For the helper command, we just need something that is alive while we
 	// test this, a sleep 5 will do it.
-	cmd := exec.Command("sleep", "5")
+	cmd := exec.CommandContext(context.TODO(), "sleep", "5")
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Cloneflags:  syscall.CLONE_NEWUSER,
 		UidMappings: []syscall.SysProcIDMap{{ContainerID: 0, HostID: usernsHostID, Size: usernsSize}},
diff --git a/test/framework/framework.go b/test/framework/framework.go
@@ -17,6 +17,7 @@ limitations under the License.
 package framework
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os/exec"
@@ -67,10 +68,10 @@ func (t *TestFramework) Describe(text string, body func()) bool {
 }
 
 // Convenience method for command creation.
-func cmd(workDir, format string, args ...interface{}) *Session {
+func cmd(workDir, format string, args ...any) *Session {
 	c := strings.Split(fmt.Sprintf(format, args...), " ")
 
-	command := exec.Command(c[0], c[1:]...)
+	command := exec.CommandContext(context.TODO(), c[0], c[1:]...)
 	if workDir != "" {
 		command.Dir = workDir
 	}
@@ -98,7 +99,7 @@ func crictlRuntimeEndpointFlag() string {
 }
 
 // Convenience method for command creation in the current working directory.
-func lcmd(format string, args ...interface{}) *Session {
+func lcmd(format string, args ...any) *Session {
 	return cmd("", format, args...)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ func marshalContainerStatus(cs *pb.ContainerStatus) (string, error) {`
`1127`	`1127`	`return "", err`
`1128`	`1128`	`}`
`1129`	`1129`
`1130`		`- jsonMap := make(map[string]interface{})`
	`1130`	`+ jsonMap := make(map[string]any)`
`1131`	`1131`
`1132`	`1132`	`err = json.Unmarshal([]byte(statusStr), &jsonMap)`
`1133`	`1133`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ func marshalPodSandboxStatus(ps *pb.PodSandboxStatus) (string, error) {`
`456`	`456`	`return "", err`
`457`	`457`	`}`
`458`	`458`
`459`		`- jsonMap := make(map[string]interface{})`
	`459`	`+ jsonMap := make(map[string]any)`
`460`	`460`
`461`	`461`	`err = json.Unmarshal([]byte(statusStr), &jsonMap)`
`462`	`462`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func builtinTmplFuncs() template.FuncMap {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// jsonBuiltinTmplFunc allows to jsonify result of template execution.`
`44`		`-func jsonBuiltinTmplFunc(v interface{}) string {`
	`44`	`+func jsonBuiltinTmplFunc(v any) string {`
`45`	`45`	`o := new(bytes.Buffer)`
`46`	`46`
`47`	`47`	`enc := json.NewEncoder(o)`
`@@ -52,15 +52,15 @@ func jsonBuiltinTmplFunc(v interface{}) string {`
`52`	`52`	`return o.String()`
`53`	`53`	`}`
`54`	`54`
`55`		`-// tmplExecuteRawJSON executes the template with interface{} with decoded by`
	`55`	`+// tmplExecuteRawJSON executes the template with any with decoded by`
`56`	`56`	`// rawJSON string.`
`57`	`57`	`func tmplExecuteRawJSON(tmplStr, rawJSON string) (string, error) {`
`58`	`58`	`dec := json.NewDecoder(`
`59`	`59`	`bytes.NewReader([]byte(rawJSON)),`
`60`	`60`	`)`
`61`	`61`	`dec.UseNumber()`
`62`	`62`
`63`		`- var raw interface{}`
	`63`	`+ var raw any`
`64`	`64`	`if err := dec.Decode(&raw); err != nil {`
`65`	`65`	`return "", fmt.Errorf("failed to decode json: %w", err)`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ ARCHITECTURES=(`
`26`	`26`	`arm64`
`27`	`27`	`ppc64le`
`28`	`28`	`s390x`
`29`		`- mips64le`
`30`	`29`	`)`
`31`	`30`
`32`	`31`	`# Prepare the system`