Skip to content

Commit 7abf2e5

Browse files
galal-husseingalal-hussein
committed
Update to v1.26.0-rc.0
Signed-off-by: galal-hussein <[email protected]>
1 parent d6cb76f commit 7abf2e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+378
-304
lines changed

‎backend/daemon.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/sirupsen/logrus"
2626
"google.golang.org/grpc"
27-
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
27+
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
2828
"k8s.io/kubernetes/pkg/kubelet/util"
2929

3030
"github.com/Mirantis/cri-dockerd/core"

‎cmd/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
"github.com/spf13/cobra"
3333
"github.com/spf13/pflag"
34-
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
34+
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
3535
)
3636

3737
const (

‎core/container_attach.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ package core
1818

1919
import (
2020
"context"
21+
2122
"github.com/Mirantis/cri-dockerd/libdocker"
2223
"github.com/Mirantis/cri-dockerd/streaming"
23-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
24+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2425
)
2526

2627
// Attach prepares a streaming endpoint to attach to a running container, and returns the address.
@@ -37,4 +38,3 @@ func (ds *dockerService) Attach(
3738
}
3839
return ds.streamingServer.GetAttach(req)
3940
}
40-

‎core/container_create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ package core
1919
import (
2020
"context"
2121
"fmt"
22+
"path/filepath"
23+
2224
"github.com/Mirantis/cri-dockerd/libdocker"
2325
"github.com/docker/docker/api/types"
2426
"github.com/docker/docker/api/types/container"
2527
"github.com/docker/docker/api/types/strslice"
26-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
27-
"path/filepath"
28+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2829
)
2930

3031
// CreateContainer creates a new container in the given PodSandbox
@@ -159,4 +160,3 @@ func (ds *dockerService) CreateContainer(
159160

160161
return nil, createErr
161162
}
162-

‎core/container_exec.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ import (
2020
"bytes"
2121
"context"
2222
"fmt"
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"
27-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
28-
"time"
29+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2930
)
3031

3132
// ExecSync executes a command in the container, and returns the stdout output.
@@ -79,4 +80,3 @@ func (ds *dockerService) Exec(
7980
}
8081
return ds.streamingServer.GetExec(req)
8182
}
82-

‎core/container_list.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ package core
1818

1919
import (
2020
"context"
21+
2122
"github.com/docker/docker/api/types"
2223
"github.com/docker/docker/api/types/filters"
2324
"github.com/sirupsen/logrus"
24-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
25+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2526
)
2627

2728
// ListContainers lists all containers matching the filter.

‎core/container_remove.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ package core
1919
import (
2020
"context"
2121
"fmt"
22+
"time"
23+
2224
"github.com/Mirantis/cri-dockerd/libdocker"
2325
"github.com/docker/docker/api/types"
24-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
25-
"time"
26+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2627
)
2728

2829
// RemoveContainer removes the container.
@@ -92,4 +93,4 @@ func getContainerTimestamps(r *types.ContainerJSON) (time.Time, time.Time, time.
9293
return createdAt, startedAt, finishedAt, err
9394
}
9495
return createdAt, startedAt, finishedAt, nil
95-
}
96+
}

‎core/container_start.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ package core
1919
import (
2020
"context"
2121
"fmt"
22-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
22+
23+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2324
)
2425

2526
// StartContainer starts the container.
@@ -58,4 +59,3 @@ func transformStartContainerError(err error) error {
5859
}
5960
return err
6061
}
61-

‎core/container_status.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ package core
1919
import (
2020
"context"
2121
"fmt"
22+
2223
"github.com/Mirantis/cri-dockerd/libdocker"
2324
"github.com/sirupsen/logrus"
24-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
25+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2526
)
2627

2728
// ContainerStatus inspects the docker container and returns the status.
@@ -138,4 +139,3 @@ func (ds *dockerService) ContainerStatus(
138139
}
139140
return &v1.ContainerStatusResponse{Status: status}, nil
140141
}
141-

‎core/container_stop.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ package core
1818

1919
import (
2020
"context"
21-
v1 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
2221
"time"
22+
23+
v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
2324
)
2425

2526
// StopContainer stops a running container with a grace period (i.e., timeout).
@@ -33,4 +34,3 @@ func (ds *dockerService) StopContainer(
3334
}
3435
return &v1.StopContainerResponse{}, nil
3536
}
36-

0 commit comments

Comments
 (0)