Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1215 from Random-Liu/update-kubernetes
Browse files Browse the repository at this point in the history
Update kubernetes
  • Loading branch information
Random-Liu committed Aug 1, 2019
2 parents fe5eb76 + 8a5b6b8 commit f636fb0
Show file tree
Hide file tree
Showing 183 changed files with 7,538 additions and 3,696 deletions.
2 changes: 1 addition & 1 deletion hack/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..

# Not from vendor.conf.
CRITOOL_VERSION=v1.13.0
CRITOOL_VERSION=v1.15.0
CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools
CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools

Expand Down
2 changes: 1 addition & 1 deletion integration/addition_gids_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestAdditionalGids(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/container_log_test.go
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"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestContainerLogWithoutTailingNewLine(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/container_stats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// Test to verify for a container ID
Expand Down
2 changes: 1 addition & 1 deletion integration/container_stop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestSharedPidMultiProcessContainerStop(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/container_update_resources_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func checkMemoryLimit(t *testing.T, spec *runtimespec.Spec, memLimit int64) {
Expand Down
2 changes: 1 addition & 1 deletion integration/container_without_image_ref_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// Test container lifecycle can work without image references.
Expand Down
2 changes: 1 addition & 1 deletion integration/containerd_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// Test to test the CRI plugin should see image pulled into containerd directly.
Expand Down
2 changes: 1 addition & 1 deletion integration/image_load_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// Test to load an image from tarball.
Expand Down
2 changes: 1 addition & 1 deletion integration/imagefs_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestImageFSInfo(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/no_metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestRunPodSandboxWithoutMetadata(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/pod_hostname_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestPodHostname(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/restart_test.go
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"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// Restart test must run sequentially.
Expand Down
2 changes: 1 addition & 1 deletion integration/runtime_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestRuntimeHandler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/sandbox_clean_remove_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"golang.org/x/sys/unix"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestSandboxCleanRemove(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions integration/test_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"k8s.io/kubernetes/pkg/kubelet/apis/cri"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
"k8s.io/cri-api/pkg/apis"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/remote"
kubeletutil "k8s.io/kubernetes/pkg/kubelet/util"

Expand Down
2 changes: 1 addition & 1 deletion integration/truncindex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func genTruncIndex(normalName string) string {
Expand Down
2 changes: 1 addition & 1 deletion integration/volume_copy_up_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestVolumeCopyUp(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/opts/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/opts/spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestMergeGids(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_attach.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
"k8s.io/client-go/tools/remotecommand"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

cio "github.com/containerd/cri/pkg/server/io"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/containerd/cri/pkg/annotations"
customopts "github.com/containerd/cri/pkg/containerd/opts"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/containerd/cri/pkg/annotations"
"github.com/containerd/cri/pkg/containerd/opts"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package server
import (
"github.com/pkg/errors"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// Exec prepares a streaming endpoint to execute a command in the container, and returns the address.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_execsync.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
"k8s.io/client-go/tools/remotecommand"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

ctrdutil "github.com/containerd/cri/pkg/containerd/util"
cioutil "github.com/containerd/cri/pkg/ioutil"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package server
import (
"golang.org/x/net/context"

runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

containerstore "github.com/containerd/cri/pkg/store/container"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

containerstore "github.com/containerd/cri/pkg/store/container"
sandboxstore "github.com/containerd/cri/pkg/store/sandbox"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_log_reopen.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/pkg/errors"
"golang.org/x/net/context"

runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// ReopenContainerLog asks the cri plugin to reopen the stdout/stderr log file for the container.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/containerd/cri/pkg/log"
"github.com/containerd/cri/pkg/store"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_start.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

ctrdutil "github.com/containerd/cri/pkg/containerd/util"
cioutil "github.com/containerd/cri/pkg/ioutil"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
tasks "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/pkg/errors"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// ContainerStats returns stats of the container. If the container does not
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_stats_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/containerd/typeurl"
"github.com/pkg/errors"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

containerstore "github.com/containerd/cri/pkg/store/container"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/containerd/cri/pkg/store"
containerstore "github.com/containerd/cri/pkg/store/container"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

containerstore "github.com/containerd/cri/pkg/store/container"
imagestore "github.com/containerd/cri/pkg/store/image"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

ctrdutil "github.com/containerd/cri/pkg/containerd/util"
"github.com/containerd/cri/pkg/store"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_update_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/containerd/cri/pkg/containerd/opts"
ctrdutil "github.com/containerd/cri/pkg/containerd/util"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_update_resources_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/golang/protobuf/proto"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestUpdateOCILinuxResource(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

runtimeoptions "github.com/containerd/cri/pkg/api/runtimeoptions/v1"
criconfig "github.com/containerd/cri/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/helpers_selinux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/opencontainers/selinux/go-selinux"
"github.com/stretchr/testify/assert"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

func TestInitSelinuxOpts(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package server

import (
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// ListImages lists existing images.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

imagestore "github.com/containerd/cri/pkg/store/image"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// For image management:
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_pull_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

criconfig "github.com/containerd/cri/pkg/config"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/containerd/containerd/images"
"github.com/pkg/errors"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"

"github.com/containerd/cri/pkg/store"
)
Expand Down
Loading

0 comments on commit f636fb0

Please sign in to comment.