Permalink
Browse files

Merge pull request kubernetes#58973 from verb/cri-enum

Automatic merge from submit-queue (batch tested with PRs 59276, 51042, 58973, 59377, 59472). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update Container Runtime Interface to use enumerated namespace modes

**What this PR does / why we need it**: This updates the CRI as described in the [Shared PID Namespace](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node/pod-pid-namespace.md#container-runtime-interface-changes) proposal. This change to the alpha API is not backwards compatible: implementations of the CRI will need to update to the new API version.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
WIP kubernetes#1615

**Special notes for your reviewer**:
/assign @yujuhong 

**Release note**:

```release-note
[action-required] The Container Runtime Interface (CRI) version has increased from v1alpha1 to v1alpha2. Runtimes implementing the CRI will need to update to the new version, which configures container namespaces using an enumeration rather than booleans.
```
  • Loading branch information...
k8s-merge-robot committed Feb 7, 2018
2 parents 1f62514 + e10042d commit cf7073a8315aa964d744c6abc3255d0f75b3d265
Showing with 835 additions and 719 deletions.
  1. +1 −1 hack/.golint_failures
  2. +1 −1 hack/update-generated-runtime-dockerized.sh
  3. +1 −1 hack/verify-generated-runtime.sh
  4. +2 −2 pkg/kubelet/BUILD
  5. +2 −2 pkg/kubelet/apis/cri/BUILD
  6. +1 −2 pkg/kubelet/apis/cri/{v1alpha1/runtime → runtime/v1alpha2}/BUILD
  7. +545 −514 pkg/kubelet/apis/cri/{v1alpha1/runtime → runtime/v1alpha2}/api.pb.go
  8. +33 −7 pkg/kubelet/apis/cri/{v1alpha1/runtime → runtime/v1alpha2}/api.proto
  9. +1 −1 pkg/kubelet/apis/cri/{v1alpha1/runtime → runtime/v1alpha2}/constants.go
  10. +1 −1 pkg/kubelet/apis/cri/services.go
  11. +1 −1 pkg/kubelet/apis/cri/testing/BUILD
  12. +1 −1 pkg/kubelet/apis/cri/testing/fake_image_service.go
  13. +1 −1 pkg/kubelet/apis/cri/testing/fake_runtime_service.go
  14. +1 −1 pkg/kubelet/apis/cri/testing/utils.go
  15. +2 −2 pkg/kubelet/cm/cpumanager/BUILD
  16. +1 −1 pkg/kubelet/cm/cpumanager/cpu_manager.go
  17. +1 −1 pkg/kubelet/cm/cpumanager/cpu_manager_test.go
  18. +1 −1 pkg/kubelet/container/BUILD
  19. +1 −1 pkg/kubelet/container/helpers.go
  20. +1 −1 pkg/kubelet/container/runtime.go
  21. +1 −1 pkg/kubelet/container/testing/BUILD
  22. +1 −1 pkg/kubelet/container/testing/fake_runtime_helper.go
  23. +2 −2 pkg/kubelet/dockershim/BUILD
  24. +1 −1 pkg/kubelet/dockershim/convert.go
  25. +1 −1 pkg/kubelet/dockershim/convert_test.go
  26. +1 −1 pkg/kubelet/dockershim/doc.go
  27. +1 −1 pkg/kubelet/dockershim/docker_container.go
  28. +1 −1 pkg/kubelet/dockershim/docker_container_test.go
  29. +1 −1 pkg/kubelet/dockershim/docker_image.go
  30. +1 −1 pkg/kubelet/dockershim/docker_image_linux.go
  31. +1 −1 pkg/kubelet/dockershim/docker_image_test.go
  32. +1 −1 pkg/kubelet/dockershim/docker_image_unsupported.go
  33. +1 −1 pkg/kubelet/dockershim/docker_image_windows.go
  34. +1 −1 pkg/kubelet/dockershim/docker_logs.go
  35. +28 −29 pkg/kubelet/dockershim/docker_sandbox.go
  36. +24 −15 pkg/kubelet/dockershim/docker_sandbox_test.go
  37. +1 −1 pkg/kubelet/dockershim/docker_service.go
  38. +1 −1 pkg/kubelet/dockershim/docker_service_test.go
  39. +1 −1 pkg/kubelet/dockershim/docker_stats_linux.go
  40. +1 −1 pkg/kubelet/dockershim/docker_stats_unsupported.go
  41. +1 −1 pkg/kubelet/dockershim/docker_stats_windows.go
  42. +1 −1 pkg/kubelet/dockershim/docker_streaming.go
  43. +1 −1 pkg/kubelet/dockershim/helpers.go
  44. +1 −1 pkg/kubelet/dockershim/helpers_linux.go
  45. +1 −1 pkg/kubelet/dockershim/helpers_test.go
  46. +1 −1 pkg/kubelet/dockershim/helpers_unsupported.go
  47. +2 −2 pkg/kubelet/dockershim/helpers_windows.go
  48. +1 −1 pkg/kubelet/dockershim/naming.go
  49. +1 −1 pkg/kubelet/dockershim/naming_test.go
  50. +1 −1 pkg/kubelet/dockershim/remote/BUILD
  51. +1 −1 pkg/kubelet/dockershim/remote/docker_server.go
  52. +9 −20 pkg/kubelet/dockershim/security_context.go
  53. +13 −15 pkg/kubelet/dockershim/security_context_test.go
  54. +1 −1 pkg/kubelet/dockershim/selinux_util.go
  55. +1 −1 pkg/kubelet/kubelet_network.go
  56. +1 −1 pkg/kubelet/kubelet_pods.go
  57. +1 −1 pkg/kubelet/kubelet_pods_test.go
  58. +2 −2 pkg/kubelet/kuberuntime/BUILD
  59. +33 −1 pkg/kubelet/kuberuntime/helpers.go
  60. +43 −1 pkg/kubelet/kuberuntime/helpers_test.go
  61. +1 −1 pkg/kubelet/kuberuntime/instrumented_services.go
  62. +1 −1 pkg/kubelet/kuberuntime/instrumented_services_test.go
  63. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_container.go
  64. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_container_test.go
  65. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_gc.go
  66. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_gc_test.go
  67. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_image.go
  68. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_image_test.go
  69. +4 −5 pkg/kubelet/kuberuntime/kuberuntime_manager.go
  70. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
  71. +2 −6 pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
  72. +1 −1 pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go
  73. +2 −2 pkg/kubelet/kuberuntime/logs/BUILD
  74. +1 −1 pkg/kubelet/kuberuntime/logs/logs.go
  75. +1 −1 pkg/kubelet/kuberuntime/logs/logs_test.go
  76. +2 −6 pkg/kubelet/kuberuntime/security_context.go
  77. +2 −2 pkg/kubelet/network/dns/BUILD
  78. +1 −1 pkg/kubelet/network/dns/dns.go
  79. +1 −1 pkg/kubelet/network/dns/dns_test.go
  80. +1 −1 pkg/kubelet/pleg/BUILD
  81. +1 −1 pkg/kubelet/pleg/generic.go
  82. +1 −1 pkg/kubelet/remote/BUILD
  83. +1 −1 pkg/kubelet/remote/fake/BUILD
  84. +1 −1 pkg/kubelet/remote/fake/fake_image_service.go
  85. +1 −1 pkg/kubelet/remote/fake/fake_runtime.go
  86. +1 −1 pkg/kubelet/remote/remote_image.go
  87. +1 −1 pkg/kubelet/remote/remote_runtime.go
  88. +1 −1 pkg/kubelet/remote/utils.go
  89. +2 −2 pkg/kubelet/server/streaming/BUILD
  90. +1 −1 pkg/kubelet/server/streaming/server.go
  91. +1 −1 pkg/kubelet/server/streaming/server_test.go
  92. +2 −2 pkg/kubelet/stats/BUILD
  93. +1 −1 pkg/kubelet/stats/cri_stats_provider.go
  94. +1 −1 pkg/kubelet/stats/cri_stats_provider_test.go
  95. +2 −2 test/e2e_node/BUILD
  96. +1 −1 test/e2e_node/container_manager_test.go
  97. +1 −1 test/e2e_node/cpu_manager_test.go
  98. +1 −1 test/e2e_node/garbage_collector_test.go
  99. +1 −1 test/e2e_node/image_list.go
View
@@ -160,8 +160,8 @@ pkg/kubectl/util/crlf
pkg/kubectl/util/slice
pkg/kubelet
pkg/kubelet/apis
pkg/kubelet/apis/cri/runtime/v1alpha2
pkg/kubelet/apis/cri/testing
pkg/kubelet/apis/cri/v1alpha1/runtime
pkg/kubelet/apis/deviceplugin/v1alpha
pkg/kubelet/apis/kubeletconfig
pkg/kubelet/apis/kubeletconfig/v1alpha1
@@ -19,7 +19,7 @@ set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime/"
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/runtime/v1alpha2/"
source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
@@ -19,7 +19,7 @@ set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime"
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/runtime/v1alpha2"
source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
View
@@ -42,7 +42,7 @@ go_library(
"//pkg/fieldpath:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/apis/cri:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/cadvisor:go_default_library",
"//pkg/kubelet/certificate:go_default_library",
@@ -169,7 +169,7 @@ go_test(
"//pkg/capabilities:go_default_library",
"//pkg/cloudprovider/providers/fake:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/cadvisor/testing:go_default_library",
"//pkg/kubelet/cm:go_default_library",
@@ -9,7 +9,7 @@ go_library(
name = "go_default_library",
srcs = ["services.go"],
importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri",
deps = ["//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library"],
deps = ["//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library"],
)
filegroup(
@@ -23,8 +23,8 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:all-srcs",
"//pkg/kubelet/apis/cri/testing:all-srcs",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:all-srcs",
],
tags = ["automanaged"],
)
@@ -11,7 +11,7 @@ go_library(
"api.pb.go",
"constants.go",
],
importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime",
importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2",
deps = [
"//vendor/github.com/gogo/protobuf/gogoproto:go_default_library",
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
@@ -37,5 +37,4 @@ filegroup(
filegroup(
name = "go_default_library_protos",
srcs = ["api.proto"],
visibility = ["//visibility:public"],
)

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,7 +1,8 @@
// To regenerate api.pb.go run hack/update-generated-runtime.sh
syntax = 'proto3';
package runtime;
package runtime.v1alpha2;
option go_package = "v1alpha2";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";
@@ -178,14 +179,39 @@ message Mount {
MountPropagation propagation = 5;
}
// A NamespaceMode describes the intended namespace configuration for each
// of the namespaces (Network, PID, IPC) in NamespaceOption. Runtimes should
// map these modes as appropriate for the technology underlying the runtime.
enum NamespaceMode {
// A POD namespace is common to all containers in a pod.
// For example, a container with a PID namespace of POD expects to view
// all of the processes in all of the containers in the pod.
POD = 0;
// A CONTAINER namespace is restricted to a single container.
// For example, a container with a PID namespace of CONTAINER expects to
// view only the processes in that container.
CONTAINER = 1;
// A NODE namespace is the namespace of the Kubernetes node.
// For example, a container with a PID namespace of NODE expects to view
// all of the processes on the host running the kubelet.
NODE = 2;
}
// NamespaceOption provides options for Linux namespaces.
message NamespaceOption {
// If set, use the host's network namespace.
bool host_network = 1;
// If set, use the host's PID namespace.
bool host_pid = 2;
// If set, use the host's IPC namespace.
bool host_ipc = 3;
// Network namespace for this container/sandbox.
// Note: There is currently no way to set CONTAINER scoped network in the Kubernetes API.
// Namespaces currently set by the kubelet: POD, NODE
NamespaceMode network = 1;
// PID namespace for this container/sandbox.
// Note: The CRI default is POD, but the v1.PodSpec default is CONTAINER.
// The kubelet's runtime manager will set this to CONTAINER explicitly for v1 pods.
// Namespaces currently set by the kubelet: POD, CONTAINER, NODE
NamespaceMode pid = 2;
// IPC namespace for this container/sandbox.
// Note: There is currently no way to set CONTAINER scoped IPC in the Kubernetes API.
// Namespaces currently set by the kubelet: POD, NODE
NamespaceMode ipc = 3;
}
// Int64Value is the wrapper of int64.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package runtime
package v1alpha2
// This file contains all constants defined in CRI.
@@ -19,7 +19,7 @@ package cri
import (
"time"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// RuntimeVersioner contains methods for runtime name, version and API version.
@@ -14,7 +14,7 @@ go_library(
],
importpath = "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing",
deps = [
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/util/sliceutils:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
],
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
)
@@ -22,7 +22,7 @@ import (
"sync"
"time"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
var (
@@ -19,7 +19,7 @@ package testing
import (
"fmt"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
func BuildContainerName(metadata *runtimeapi.ContainerMetadata, sandboxID string) string {
@@ -14,7 +14,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/core/v1/helper/qos:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/cm/cpumanager/state:go_default_library",
"//pkg/kubelet/cm/cpumanager/topology:go_default_library",
"//pkg/kubelet/cm/cpuset:go_default_library",
@@ -39,7 +39,7 @@ go_test(
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager",
deps = [
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/cm/cpumanager/state:go_default_library",
"//pkg/kubelet/cm/cpumanager/topology:go_default_library",
"//pkg/kubelet/cm/cpuset:go_default_library",
@@ -27,7 +27,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/wait"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology"
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
@@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state"
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
"os"
@@ -54,7 +54,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/kubelet/util/ioutils:go_default_library",
"//pkg/util/hash:go_default_library",
@@ -31,7 +31,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
hashutil "k8s.io/kubernetes/pkg/util/hash"
@@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/remotecommand"
"k8s.io/client-go/util/flowcontrol"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/volume"
)
@@ -14,7 +14,7 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/container/testing",
visibility = ["//visibility:public"],
deps = [
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/volume:go_default_library",
"//vendor/github.com/golang/mock/gomock:go_default_library",
@@ -19,7 +19,7 @@ package testing
import (
"k8s.io/api/core/v1"
kubetypes "k8s.io/apimachinery/pkg/types"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
)
@@ -85,7 +85,7 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim",
deps = [
"//pkg/credentialprovider:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
@@ -157,7 +157,7 @@ go_test(
embed = [":go_default_library"],
importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim",
deps = [
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/kubelet/dockershim/libdocker:go_default_library",
@@ -23,7 +23,7 @@ import (
dockertypes "github.com/docker/docker/api/types"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)
@@ -22,7 +22,7 @@ import (
dockertypes "github.com/docker/docker/api/types"
"github.com/stretchr/testify/assert"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
func TestConvertDockerStatusToRuntimeAPIState(t *testing.T) {
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// Docker integration using pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go
// Docker integration using pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go
package dockershim
@@ -29,7 +29,7 @@ import (
"github.com/golang/glog"
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)
@@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
)
@@ -25,7 +25,7 @@ import (
"github.com/docker/docker/pkg/jsonmessage"
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)
@@ -23,7 +23,7 @@ import (
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// ImageFsInfo returns information of the filesystem that is used to store images.
@@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)
@@ -23,7 +23,7 @@ import (
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// ImageFsInfo returns information of the filesystem that is used to store images.
@@ -23,7 +23,7 @@ import (
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// ImageFsInfo returns information of the filesystem that is used to store images.
@@ -21,7 +21,7 @@ import (
"golang.org/x/net/context"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// ReopenContainerLog reopens the container log file.
Oops, something went wrong.

0 comments on commit cf7073a

Please sign in to comment.