Merge pull request #6178 from saschagrunert/lint

Fix lint CI

.golangci.yml

@@ -11,8 +11,6 @@ run:
     - exclude_graphdriver_btrfs
     # needs devmapper headers installed
     - exclude_graphdriver_devicemapper
-    # remove this tag when golangci lint supports go 1.18 and generics                                                                                                   │noctx: noctx finds sending http request without context.Context [fast: false, auto-fix: false]
-    - skip_pod_runtime
   concurrency: 6
   deadline: 10m
 linters:

internal/oci/runtime_oci.go

@@ -965,7 +965,7 @@ func (r *runtimeOCI) UpdateContainerStatus(ctx context.Context, c *Container) er
 			// We always populate the fields below so kube can restart/reschedule
 			// containers failing.
 			if exitErr, isExitError := err.(*exec.ExitError); isExitError {
-				log.Errorf(ctx, "Failed to update container state for %s: stdout: %s, stderr: %s", c.ID(), string(out), string(exitErr.Stderr))
+				log.Errorf(ctx, "Failed to update container state for %s: stdout: %s, stderr: %s", c.ID(), out, string(exitErr.Stderr))
 			} else {
 				log.Errorf(ctx, "Failed to update container state for %s: %v", c.ID(), err)
 			}

internal/oci/runtime_pod.go

@@ -154,8 +154,8 @@ func (r *runtimePod) RestoreContainer(
 	return r.oci.RestoreContainer(ctx, c, sbSpec, infraPid, cgroupParent)
 }
 
-func (r *runtimePod) ExecContainer(ctx context.Context, c *Container, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) error {
-	return r.oci.ExecContainer(ctx, c, cmd, stdin, stdout, stderr, tty, resize)
+func (r *runtimePod) ExecContainer(ctx context.Context, c *Container, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resizeChan <-chan remotecommand.TerminalSize) error {
+	return r.oci.ExecContainer(ctx, c, cmd, stdin, stdout, stderr, tty, resizeChan)
 }
 
 func (r *runtimePod) ExecSyncContainer(ctx context.Context, c *Container, cmd []string, timeout int64) (*types.ExecSyncResponse, error) {