Merge pull request #29884 from yujuhong/mv_services

Automatic merge from submit-queue

kubelet: move kuberuntime.go to api/services.go

pkg/kubelet/api/services.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package container
+package api
 
 import (
 	"io"

pkg/kubelet/api/testing/fake_image_service.go

@@ -0,0 +1,47 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testing
+
+import (
+	"fmt"
+
+	internalApi "k8s.io/kubernetes/pkg/kubelet/api"
+	runtimeApi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+)
+
+type fakeImageService struct {
+}
+
+func NewFakeImageService() internalApi.ImageManagerService {
+	return &fakeImageService{}
+}
+
+func (r *fakeImageService) ListImages(filter *runtimeApi.ImageFilter) ([]*runtimeApi.Image, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeImageService) ImageStatus(image *runtimeApi.ImageSpec) (*runtimeApi.Image, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeImageService) PullImage(image *runtimeApi.ImageSpec, auth *runtimeApi.AuthConfig) error {
+	return fmt.Errorf("not implemented")
+}
+
+func (r *fakeImageService) RemoveImage(image *runtimeApi.ImageSpec) error {
+	return fmt.Errorf("not implemented")
+}

pkg/kubelet/api/testing/fake_runtime_service.go

@@ -0,0 +1,84 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testing
+
+import (
+	"fmt"
+	"io"
+
+	internalApi "k8s.io/kubernetes/pkg/kubelet/api"
+	runtimeApi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+)
+
+type fakeRuntimeService struct {
+}
+
+func NewFakeRuntimeService() internalApi.RuntimeService {
+	return &fakeRuntimeService{}
+}
+
+func (r *fakeRuntimeService) Version(apiVersion string) (*runtimeApi.VersionResponse, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) CreatePodSandbox(config *runtimeApi.PodSandboxConfig) (string, error) {
+	return "", fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) StopPodSandbox(podSandboxID string) error {
+	return fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) DeletePodSandbox(podSandboxID string) error {
+	return fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) PodSandboxStatus(podSandboxID string) (*runtimeApi.PodSandboxStatus, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) ListPodSandbox(filter *runtimeApi.PodSandboxFilter) ([]*runtimeApi.PodSandbox, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) CreateContainer(podSandboxID string, config *runtimeApi.ContainerConfig, sandboxConfig *runtimeApi.PodSandboxConfig) (string, error) {
+	return "", fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) StartContainer(rawContainerID string) error {
+	return fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) StopContainer(rawContainerID string, timeout int64) error {
+	return fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) RemoveContainer(rawContainerID string) error {
+	return fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) ListContainers(filter *runtimeApi.ContainerFilter) ([]*runtimeApi.Container, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) ContainerStatus(rawContainerID string) (*runtimeApi.ContainerStatus, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *fakeRuntimeService) Exec(rawContainerID string, cmd []string, tty bool, stdin io.Reader, stdout, stderr io.WriteCloser) error {
+	return fmt.Errorf("not implemented")
+}

pkg/kubelet/dockershim/docker_service.go

@@ -21,6 +21,7 @@ import (
 	"io"
 
 	"k8s.io/kubernetes/pkg/api"
+	internalApi "k8s.io/kubernetes/pkg/kubelet/api"
 	runtimeApi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/dockertools"
@@ -48,8 +49,8 @@ func NewDockerSevice(client dockertools.DockerInterface) DockerLegacyService {
 // RuntimeService and ImageService interfaces, while including legacy methods
 // for backward compatibility.
 type DockerLegacyService interface {
-	kubecontainer.RuntimeService
+	internalApi.RuntimeService
-	kubecontainer.ImageManagerService
+	internalApi.ImageManagerService
 
 	// Supporting legacy methods for docker.
 	GetContainerLogs(pod *api.Pod, containerID kubecontainer.ContainerID, logOptions *api.PodLogOptions, stdout, stderr io.Writer) (err error)