vendor updates

This commit is contained in:
Serguei Bezverkhi
2018-03-06 17:33:18 -05:00
parent 4b3ebc171b
commit e9033989a0
5854 changed files with 248382 additions and 119809 deletions

View File

@ -17,7 +17,7 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/remote",
deps = [
"//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/util:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",
@ -45,13 +45,13 @@ filegroup(
go_test(
name = "go_default_test",
srcs = ["remote_runtime_test.go"],
importpath = "k8s.io/kubernetes/pkg/kubelet/remote",
library = ":go_default_library",
embed = [":go_default_library"],
tags = ["automanaged"],
deps = [
"//pkg/kubelet/apis/cri:go_default_library",
"//pkg/kubelet/apis/cri/testing:go_default_library",
"//pkg/kubelet/remote/fake:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
],
)

View File

@ -11,11 +11,40 @@ go_library(
name = "go_default_library",
srcs = [
"doc.go",
"endpoint.go",
"fake_image_service.go",
"fake_runtime.go",
] + select({
"@io_bazel_rules_go//go/platform:windows_amd64": [
"@io_bazel_rules_go//go/platform:android": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:darwin": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:dragonfly": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:freebsd": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:linux": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:nacl": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:netbsd": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:openbsd": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:plan9": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:solaris": [
"endpoint.go",
],
"@io_bazel_rules_go//go/platform:windows": [
"endpoint_windows.go",
],
"//conditions:default": [],
@ -23,8 +52,8 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/remote/fake",
tags = ["automanaged"],
deps = [
"//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
"//pkg/kubelet/apis/cri/testing:go_default_library",
"//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library",
"//pkg/kubelet/util:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",
"//vendor/google.golang.org/grpc:go_default_library",

View File

@ -18,7 +18,7 @@ package fake
import (
"golang.org/x/net/context"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
// ListImages lists existing images.

View File

@ -22,8 +22,8 @@ import (
"golang.org/x/net/context"
"google.golang.org/grpc"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/util"
utilexec "k8s.io/utils/exec"
)
@ -60,7 +60,8 @@ func (f *RemoteRuntime) Start(endpoint string) error {
return fmt.Errorf("failed to listen on %q: %v", endpoint, err)
}
return f.server.Serve(l)
go f.server.Serve(l)
return nil
}
// Stop stops the fake remote runtime.
@ -283,3 +284,13 @@ func (f *RemoteRuntime) UpdateContainerResources(ctx context.Context, req *kubea
return &kubeapi.UpdateContainerResourcesResponse{}, nil
}
// ReopenContainerLog reopens the container log file.
func (f *RemoteRuntime) ReopenContainerLog(ctx context.Context, req *kubeapi.ReopenContainerLogRequest) (*kubeapi.ReopenContainerLogResponse, error) {
err := f.RuntimeService.ReopenContainerLog(req.ContainerId)
if err != nil {
return nil, err
}
return &kubeapi.ReopenContainerLogResponse{}, nil
}

View File

@ -25,7 +25,7 @@ import (
"google.golang.org/grpc"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
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"
)

View File

@ -27,7 +27,7 @@ import (
"google.golang.org/grpc"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
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"
utilexec "k8s.io/utils/exec"
)
@ -476,3 +476,15 @@ func (r *RemoteRuntimeService) ListContainerStats(filter *runtimeapi.ContainerSt
return resp.GetStats(), nil
}
func (r *RemoteRuntimeService) ReopenContainerLog(containerID string) error {
ctx, cancel := getContextWithTimeout(r.timeout)
defer cancel()
_, err := r.runtimeClient.ReopenContainerLog(ctx, &runtimeapi.ReopenContainerLogRequest{ContainerId: containerID})
if err != nil {
glog.Errorf("ReopenContainerLog %q from runtime service failed: %v", containerID, err)
return err
}
return nil
}

View File

@ -21,6 +21,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing"
fakeremote "k8s.io/kubernetes/pkg/kubelet/remote/fake"
@ -35,28 +36,21 @@ const (
// Users should call fakeRuntime.Stop() to cleanup the server.
func createAndStartFakeRemoteRuntime(t *testing.T) (*fakeremote.RemoteRuntime, string) {
endpoint, err := fakeremote.GenerateEndpoint()
assert.NoError(t, err)
require.NoError(t, err)
fakeRuntime := fakeremote.NewFakeRemoteRuntime()
go fakeRuntime.Start(endpoint)
fakeRuntime.Start(endpoint)
return fakeRuntime, endpoint
}
func createRemoteRuntimeService(endpoint string, t *testing.T) internalapi.RuntimeService {
runtimeService, err := NewRemoteRuntimeService(endpoint, defaultConnectionTimeout)
assert.NoError(t, err)
require.NoError(t, err)
return runtimeService
}
func createRemoteImageService(endpoint string, t *testing.T) internalapi.ImageManagerService {
imageService, err := NewRemoteImageService(endpoint, defaultConnectionTimeout)
assert.NoError(t, err)
return imageService
}
func TestVersion(t *testing.T) {
fakeRuntime, endpoint := createAndStartFakeRemoteRuntime(t)
defer fakeRuntime.Stop()

View File

@ -22,7 +22,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"
)
// getContextWithTimeout returns a context with timeout.