Skip to content

Commit 56658b4

Browse files
authored
Bump Go to 1.24.9 (#512)
1 parent 21107f6 commit 56658b4

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
GO_VERSION=1.23.12
1+
GO_VERSION=1.24.9
22
HUGO_VERSION=0.114.0
33
LIMA_VERSION=0.20.1

core/container_exec.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ import (
2020
"bytes"
2121
"context"
2222
"errors"
23+
"time"
24+
2325
"github.com/Mirantis/cri-dockerd/libdocker"
2426
"github.com/Mirantis/cri-dockerd/streaming"
2527
"github.com/Mirantis/cri-dockerd/utils"
2628
"google.golang.org/grpc/codes"
2729
"google.golang.org/grpc/status"
2830
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
29-
"time"
3031
)
3132

3233
// ExecSync executes a command in the container, and returns the stdout output.
@@ -47,7 +48,7 @@ func (ds *dockerService) ExecSync(
4748

4849
// kubelet's backend runtime expects a grpc error with status code DeadlineExceeded on time out.
4950
if errors.Is(err, context.DeadlineExceeded) {
50-
return nil, status.Errorf(codes.DeadlineExceeded, err.Error())
51+
return nil, status.Error(codes.DeadlineExceeded, err.Error())
5152
}
5253

5354
var exitCode int32

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Mirantis/cri-dockerd
22

3-
go 1.23.12
3+
go 1.24.9
44

55
require (
66
github.com/Microsoft/hcsshim v0.12.1

0 commit comments

Comments
 (0)