github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19785 from Random-Liu/remove-get-podstatus-and-apipodstatus

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-30 11:35:26 -08:00
commit 9fef5f2938
6 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/container/fake_runtime.go
View File

@ -263,17 +263,6 @@ func (f *FakeRuntime) ConvertPodStatusToAPIPodStatus(_ *api.Pod, _ *PodStatus) (
return &status, f.Err return &status, f.Err
} }
func (f *FakeRuntime) GetPodStatusAndAPIPodStatus(_ *api.Pod) (*PodStatus, *api.PodStatus, error) {
f.Lock()
defer f.Unlock()
// This is only a temporary function, it should be logged as GetAPIPodStatus
f.CalledFunctions = append(f.CalledFunctions, "GetAPIPodStatus")
apiPodStatus := f.APIPodStatus
podStatus := f.PodStatus
return &podStatus, &apiPodStatus, f.Err
}
func (f *FakeRuntime) ExecInContainer(containerID ContainerID, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool) error { func (f *FakeRuntime) ExecInContainer(containerID ContainerID, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool) error {
f.Lock() f.Lock()
defer f.Unlock() defer f.Unlock()

3
pkg/kubelet/container/runtime.go
View File

@ -83,9 +83,6 @@ type Runtime interface {
// exists to determine the reason). We should try generalizing the logic // exists to determine the reason). We should try generalizing the logic
// for all container runtimes in kubelet and remove this funciton. // for all container runtimes in kubelet and remove this funciton.
ConvertPodStatusToAPIPodStatus(*api.Pod, *PodStatus) (*api.PodStatus, error) ConvertPodStatusToAPIPodStatus(*api.Pod, *PodStatus) (*api.PodStatus, error)
// Return both PodStatus and api.PodStatus, this is just a temporary function.
// TODO(random-liu): Remove this method later
GetPodStatusAndAPIPodStatus(*api.Pod) (*PodStatus, *api.PodStatus, error)
// PullImage pulls an image from the network to local storage using the supplied // PullImage pulls an image from the network to local storage using the supplied
// secrets if necessary. // secrets if necessary.
PullImage(image ImageSpec, pullSecrets []api.Secret) error PullImage(image ImageSpec, pullSecrets []api.Secret) error

5
pkg/kubelet/container/runtime_mock.go
View File

@ -87,11 +87,6 @@ func (r *Mock) GetPodStatus(uid types.UID, name, namespace string) (*PodStatus,
return args.Get(0).(*PodStatus), args.Error(1) return args.Get(0).(*PodStatus), args.Error(1)
} }
func (r *Mock) GetPodStatusAndAPIPodStatus(pod *api.Pod) (*PodStatus, *api.PodStatus, error) {
args := r.Called(pod)
return args.Get(0).(*PodStatus), args.Get(0).(*api.PodStatus), args.Error(2)
}
func (r *Mock) ConvertPodStatusToAPIPodStatus(pod *api.Pod, podStatus *PodStatus) (*api.PodStatus, error) { func (r *Mock) ConvertPodStatusToAPIPodStatus(pod *api.Pod, podStatus *PodStatus) (*api.PodStatus, error) {
args := r.Called(pod, podStatus) args := r.Called(pod, podStatus)
return args.Get(0).(*api.PodStatus), args.Error(1) return args.Get(0).(*api.PodStatus), args.Error(1)

11
pkg/kubelet/dockertools/manager.go
View File

@ -2166,14 +2166,3 @@ func (dm *DockerManager) GetPodStatus(uid types.UID, name, namespace string) (*k
podStatus.ContainerStatuses = containerStatuses podStatus.ContainerStatuses = containerStatuses
return podStatus, nil return podStatus, nil
} }
func (dm *DockerManager) GetPodStatusAndAPIPodStatus(pod *api.Pod) (*kubecontainer.PodStatus, *api.PodStatus, error) {
// Get the pod status.
podStatus, err := dm.GetPodStatus(pod.UID, pod.Name, pod.Namespace)
if err != nil {
return nil, nil, err
}
var apiPodStatus *api.PodStatus
apiPodStatus, err = dm.ConvertPodStatusToAPIPodStatus(pod, podStatus)
return podStatus, apiPodStatus, err
}

8
pkg/kubelet/dockertools/manager_test.go
View File

@ -543,10 +543,16 @@ func generatePodInfraContainerHash(pod *api.Pod) uint64 {
// runSyncPod is a helper function to retrieve the running pods from the fake // runSyncPod is a helper function to retrieve the running pods from the fake
// docker client and runs SyncPod for the given pod. // docker client and runs SyncPod for the given pod.
func runSyncPod(t *testing.T, dm *DockerManager, fakeDocker *FakeDockerClient, pod *api.Pod, backOff *util.Backoff, expectErr bool) { func runSyncPod(t *testing.T, dm *DockerManager, fakeDocker *FakeDockerClient, pod *api.Pod, backOff *util.Backoff, expectErr bool) {
podStatus, apiPodStatus, err := dm.GetPodStatusAndAPIPodStatus(pod) podStatus, err := dm.GetPodStatus(pod.UID, pod.Name, pod.Namespace)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
var apiPodStatus *api.PodStatus
apiPodStatus, err = dm.ConvertPodStatusToAPIPodStatus(pod, podStatus)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
fakeDocker.ClearCalls() fakeDocker.ClearCalls()
if backOff == nil { if backOff == nil {
backOff = util.NewBackOff(time.Second, time.Minute) backOff = util.NewBackOff(time.Second, time.Minute)

11
pkg/kubelet/rkt/rkt.go
View File

@ -1455,14 +1455,3 @@ func (r *Runtime) ConvertPodStatusToAPIPodStatus(pod *api.Pod, status *kubeconta
return apiPodStatus, nil return apiPodStatus, nil
} }
// TODO(yifan): Delete this function when the logic is moved to kubelet.
func (r *Runtime) GetPodStatusAndAPIPodStatus(pod *api.Pod) (*kubecontainer.PodStatus, *api.PodStatus, error) {
// Get the pod status.
podStatus, err := r.GetPodStatus(pod.UID, pod.Name, pod.Namespace)
if err != nil {
return nil, nil, err
}
apiPodStatus, err := r.ConvertPodStatusToAPIPodStatus(pod, podStatus)
return podStatus, apiPodStatus, err
}