Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kubelet: rename cri package name to pkg/kubelet/apis/cri/v1alpha1/runtime #47113

Merged
merged 3 commits into from
Jun 9, 2017
Merged

Kubelet: rename cri package name to pkg/kubelet/apis/cri/v1alpha1/runtime #47113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc2ecc
CRI: rename package name to pkg/kubelet/apis/cri/v1alpha1/runtime
feiskyer Jun 7, 2017
8367617
Update hack scripts
feiskyer Jun 7, 2017
22e9950
Update CRI references
feiskyer Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/update-generated-runtime-dockerized.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime/"
source "${KUBE_ROOT}/hack/lib/init.sh"

kube::golang::setup_env
Expand Down
16 changes: 8 additions & 8 deletions hack/verify-flags/exceptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ hack/test-update-storage-objects.sh: local storage_media_type=${3:-""}
hack/test-update-storage-objects.sh: local storage_versions=${2:-""}
hack/test-update-storage-objects.sh: source_file=${test_data[0]}
hack/test-update-storage-objects.sh:# source_file,resource,namespace,name,old_version,new_version
pkg/kubelet/apis/cri/v1alpha1/api.pb.go: ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/api.pb.go: OomScoreAdj int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/api.pb.go: PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/api.pb.go: RuntimeConfig *RuntimeConfig `protobuf:"bytes,1,opt,name=runtime_config,json=runtimeConfig" json:"runtime_config,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/api.proto: RuntimeConfig runtime_config = 1;
pkg/kubelet/apis/cri/v1alpha1/api.proto: int32 container_port = 2;
pkg/kubelet/apis/cri/v1alpha1/api.proto: int64 oom_score_adj = 5;
pkg/kubelet/apis/cri/v1alpha1/api.proto: string pod_cidr = 1;
pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: ContainerPort int32 `protobuf:"varint,2,opt,name=container_port,json=containerPort,proto3" json:"container_port,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: OomScoreAdj int64 `protobuf:"varint,5,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go: RuntimeConfig *RuntimeConfig `protobuf:"bytes,1,opt,name=runtime_config,json=runtimeConfig" json:"runtime_config,omitempty"`
pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: RuntimeConfig runtime_config = 1;
pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: int32 container_port = 2;
pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: int64 oom_score_adj = 5;
pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto: string pod_cidr = 1;
pkg/kubelet/cm/container_manager_linux.go: glog.V(3).Infof("Failed to apply oom_score_adj %d for pid %d: %v", oomScoreAdj, pid, err)
pkg/kubelet/cm/container_manager_linux.go: glog.V(5).Infof("attempting to apply oom_score_adj of %d to pid %d", oomScoreAdj, pid)
pkg/kubelet/dockershim/docker_checkpoint.go: ContainerPort *int32 `json:"container_port,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-generated-runtime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/v1alpha1/runtime"
source "${KUBE_ROOT}/hack/lib/init.sh"

kube::golang::setup_env
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/apis/cri/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ go_library(
name = "go_default_library",
srcs = ["services.go"],
tags = ["automanaged"],
deps = ["//pkg/kubelet/apis/cri/v1alpha1:go_default_library"],
deps = ["//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library"],
)

filegroup(
Expand All @@ -26,7 +26,7 @@ filegroup(
srcs = [
":package-srcs",
"//pkg/kubelet/apis/cri/testing:all-srcs",
"//pkg/kubelet/apis/cri/v1alpha1:all-srcs",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:all-srcs",
],
tags = ["automanaged"],
)
2 changes: 1 addition & 1 deletion pkg/kubelet/apis/cri/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package cri
import (
"time"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

// RuntimeVersioner contains methods for runtime name, version and API version.
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/apis/cri/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/util/sliceutils:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/apis/cri/testing/fake_image_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/apis/cri/testing/fake_runtime_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sync"
"time"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/apis/cri/testing/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package testing
import (
"fmt"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

func BuildContainerName(metadata *runtimeapi.ContainerMetadata, sandboxID string) string {
Expand Down
0 pkg/kubelet/apis/cri/v1alpha1/BUILD → pkg/kubelet/apis/cri/v1alpha1/runtime/BUILD
View file
Open in desktop
File renamed without changes.
0 pkg/kubelet/apis/cri/v1alpha1/api.pb.go → ...belet/apis/cri/v1alpha1/runtime/api.pb.go
View file
Open in desktop
File renamed without changes.
0 pkg/kubelet/apis/cri/v1alpha1/api.proto → ...belet/apis/cri/v1alpha1/runtime/api.proto
View file
Open in desktop
File renamed without changes.
0 pkg/kubelet/apis/cri/v1alpha1/constants.go → ...et/apis/cri/v1alpha1/runtime/constants.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kubelet/container/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ go_library(
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/v1/ref:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/events:go_default_library",
"//pkg/kubelet/util/format:go_default_library",
"//pkg/kubelet/util/ioutils:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/container/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
clientv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/api/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/container/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/client-go/tools/remotecommand"
"k8s.io/client-go/util/flowcontrol"
"k8s.io/kubernetes/pkg/api/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/volume"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/dockershim/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ go_library(
"//pkg/apis/componentconfig:go_default_library",
"//pkg/credentialprovider:go_default_library",
"//pkg/kubelet/apis/cri:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/dockershim/cm:go_default_library",
Expand Down Expand Up @@ -94,7 +94,7 @@ go_test(
tags = ["automanaged"],
deps = [
"//pkg/api/v1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/kubelet/dockershim/errors:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

dockertypes "github.com/docker/engine-api/types"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
dockertypes "github.com/docker/engine-api/types"
"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

func TestConvertDockerStatusToRuntimeAPIState(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/api.pb.go
// Docker integration using pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go
package dockershim
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
dockerstrslice "github.com/docker/engine-api/types/strslice"
"github.com/golang/glog"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_container_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/docker/docker/pkg/jsonmessage"
dockertypes "github.com/docker/engine-api/types"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
dockertypes "github.com/docker/engine-api/types"
"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
"k8s.io/kubernetes/pkg/kubelet/leaky"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_sandbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/golang/glog"

utilerrors "k8s.io/apimachinery/pkg/util/errors"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/dockershim/errors"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_sandbox_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
"k8s.io/kubernetes/pkg/kubelet/network"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
kubecm "k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/dockershim/cm"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/require"

"k8s.io/apimachinery/pkg/util/clock"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
"k8s.io/kubernetes/pkg/kubelet/network"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package dockershim
import (
"fmt"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

// DockerService does not implement container stats.
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_streaming.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/golang/glog"

"k8s.io/client-go/tools/remotecommand"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/server/streaming"
"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/credentialprovider"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/security/apparmor"

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/helpers_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/blang/semver"
dockertypes "github.com/docker/engine-api/types"
dockercontainer "github.com/docker/engine-api/types/container"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

func DefaultMemorySwap() int64 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

"k8s.io/kubernetes/pkg/api/v1"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/security/apparmor"

"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/helpers_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/blang/semver"
dockertypes "github.com/docker/engine-api/types"
"github.com/golang/glog"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

func DefaultMemorySwap() int64 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/helpers_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
dockerfilters "github.com/docker/engine-api/types/filters"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

func DefaultMemorySwap() int64 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/naming.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strconv"
"strings"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/leaky"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/naming_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)

func TestSandboxNameRoundTrip(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/remote/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/kubelet/apis/cri:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/dockershim:go_default_library",
"//pkg/kubelet/util:go_default_library",
"//pkg/util/exec:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/remote/docker_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/golang/glog"
"google.golang.org/grpc"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim"
"k8s.io/kubernetes/pkg/kubelet/util"
"k8s.io/kubernetes/pkg/util/interrupt"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/remote/docker_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"golang.org/x/net/context"

internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim"
utilexec "k8s.io/kubernetes/pkg/util/exec"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/security_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
dockercontainer "github.com/docker/engine-api/types/container"

"k8s.io/kubernetes/pkg/api/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
knetwork "k8s.io/kubernetes/pkg/kubelet/network"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/security_context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
dockercontainer "github.com/docker/engine-api/types/container"
"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kuberuntime/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ go_library(
"//pkg/api/v1/ref:go_default_library",
"//pkg/credentialprovider:go_default_library",
"//pkg/kubelet/apis/cri:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/events:go_default_library",
"//pkg/kubelet/images:go_default_library",
Expand Down Expand Up @@ -86,7 +86,7 @@ go_test(
"//pkg/api/v1:go_default_library",
"//pkg/credentialprovider:go_default_library",
"//pkg/kubelet/apis/cri/testing:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/kubelet/metrics:go_default_library",
Expand Down
Loading