From 4e909c6cee38bc7b54fa0a8b692f003c5ee80753 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Wed, 25 Mar 2015 16:34:02 -0700 Subject: [PATCH] Kubelet: no need to overwrite SelfLink for pods from the apiserver Pods from the apiserver should already have SelfLink set. There is no need to create one ourselves. --- pkg/kubelet/config/apiserver.go | 5 +---- pkg/kubelet/config/apiserver_test.go | 22 ++++++---------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go index 3710e525caf..8aeb0182b07 100644 --- a/pkg/kubelet/config/apiserver.go +++ b/pkg/kubelet/config/apiserver.go @@ -36,10 +36,7 @@ func newSourceApiserverFromLW(lw cache.ListerWatcher, updates chan<- interface{} send := func(objs []interface{}) { var pods []api.Pod for _, o := range objs { - pod := o.(*api.Pod) - // Make a dummy self link so that references to this pod will work. - pod.SelfLink = "/api/v1beta1/pods/" + pod.Name - pods = append(pods, *pod) + pods = append(pods, *o.(*api.Pod)) } updates <- kubelet.PodUpdate{pods, kubelet.SET, kubelet.ApiserverSource} } diff --git a/pkg/kubelet/config/apiserver_test.go b/pkg/kubelet/config/apiserver_test.go index 6f51dfa03dd..7b5367578fb 100644 --- a/pkg/kubelet/config/apiserver_test.go +++ b/pkg/kubelet/config/apiserver_test.go @@ -52,16 +52,6 @@ func TestNewSourceApiserver_UpdatesAndMultiplePods(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "q"}, Spec: api.PodSpec{Containers: []api.Container{{Image: "image/blah"}}}} - expectedPod1v1 := api.Pod{ - ObjectMeta: api.ObjectMeta{Name: "p", SelfLink: "/api/v1beta1/pods/p"}, - Spec: api.PodSpec{Containers: []api.Container{{Image: "image/one"}}}} - expectedPod1v2 := api.Pod{ - ObjectMeta: api.ObjectMeta{Name: "p", SelfLink: "/api/v1beta1/pods/p"}, - Spec: api.PodSpec{Containers: []api.Container{{Image: "image/two"}}}} - expectedPod2 := api.Pod{ - ObjectMeta: api.ObjectMeta{Name: "q", SelfLink: "/api/v1beta1/pods/q"}, - Spec: api.PodSpec{Containers: []api.Container{{Image: "image/blah"}}}} - // Setup fake api client. fakeWatch := watch.NewFake() lw := fakePodLW{ @@ -78,7 +68,7 @@ func TestNewSourceApiserver_UpdatesAndMultiplePods(t *testing.T) { t.Errorf("Unable to read from channel when expected") } update := got.(kubelet.PodUpdate) - expected := CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, expectedPod1v1) + expected := CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, pod1v1) if !api.Semantic.DeepEqual(expected, update) { t.Errorf("Expected %#v; Got %#v", expected, update) } @@ -91,8 +81,8 @@ func TestNewSourceApiserver_UpdatesAndMultiplePods(t *testing.T) { } update = got.(kubelet.PodUpdate) // Could be sorted either of these two ways: - expectedA := CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, expectedPod1v1, expectedPod2) - expectedB := CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, expectedPod2, expectedPod1v1) + expectedA := CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, pod1v1, pod2) + expectedB := CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, pod2, pod1v1) if !api.Semantic.DeepEqual(expectedA, update) && !api.Semantic.DeepEqual(expectedB, update) { t.Errorf("Expected %#v or %#v, Got %#v", expectedA, expectedB, update) @@ -105,8 +95,8 @@ func TestNewSourceApiserver_UpdatesAndMultiplePods(t *testing.T) { t.Errorf("Unable to read from channel when expected") } update = got.(kubelet.PodUpdate) - expectedA = CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, expectedPod1v2, expectedPod2) - expectedB = CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, expectedPod2, expectedPod1v2) + expectedA = CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, pod1v2, pod2) + expectedB = CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, pod2, pod1v2) if !api.Semantic.DeepEqual(expectedA, update) && !api.Semantic.DeepEqual(expectedB, update) { t.Errorf("Expected %#v or %#v, Got %#v", expectedA, expectedB, update) @@ -119,7 +109,7 @@ func TestNewSourceApiserver_UpdatesAndMultiplePods(t *testing.T) { t.Errorf("Unable to read from channel when expected") } update = got.(kubelet.PodUpdate) - expected = CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, expectedPod2) + expected = CreatePodUpdate(kubelet.SET, kubelet.ApiserverSource, pod2) if !api.Semantic.DeepEqual(expected, update) { t.Errorf("Expected %#v, Got %#v", expected, update) }