Fix lint CI

saschagrunert · saschagrunert · commit 405565c0204c · 2022-08-29T10:48:43.000+02:00
The CI was broken because of a more or less parallel merge and now it's
fixed again.

Signed-off-by: Sascha Grunert &lt;sgrunert@redhat.com&gt;
diff --git a/.golangci.yml b/.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:
diff --git a/internal/oci/runtime_oci.go b/internal/oci/runtime_oci.go
@@ -925,7 +925,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)
 			}
diff --git a/internal/oci/runtime_pod.go b/internal/oci/runtime_pod.go
@@ -135,8 +135,8 @@ func (r *runtimePod) StartContainer(ctx context.Context, c *Container) error {
 	return r.oci.StartContainer(ctx, c)
 }
 
-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) {

Original file line number	Diff line number	Diff line change
`@@ -925,7 +925,7 @@ func (r runtimeOCI) UpdateContainerStatus(ctx context.Context, c Container) er`
`925`	`925`	`// We always populate the fields below so kube can restart/reschedule`
`926`	`926`	`// containers failing.`
`927`	`927`	`if exitErr, isExitError := err.(*exec.ExitError); isExitError {`
`928`		`- log.Errorf(ctx, "Failed to update container state for %s: stdout: %s, stderr: %s", c.ID(), string(out), string(exitErr.Stderr))`
	`928`	`+ log.Errorf(ctx, "Failed to update container state for %s: stdout: %s, stderr: %s", c.ID(), out, string(exitErr.Stderr))`
`929`	`929`	`} else {`
`930`	`930`	`log.Errorf(ctx, "Failed to update container state for %s: %v", c.ID(), err)`
`931`	`931`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ func (r runtimePod) StartContainer(ctx context.Context, c Container) error {`
`135`	`135`	`return r.oci.StartContainer(ctx, c)`
`136`	`136`	`}`
`137`	`137`
`138`		`-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 {`
`139`		`- return r.oci.ExecContainer(ctx, c, cmd, stdin, stdout, stderr, tty, resize)`
	`138`	`+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 {`
	`139`	`+ return r.oci.ExecContainer(ctx, c, cmd, stdin, stdout, stderr, tty, resizeChan)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`func (r runtimePod) ExecSyncContainer(ctx context.Context, c Container, cmd []string, timeout int64) (*types.ExecSyncResponse, error) {`