From ce96182cc35e114d747fc81bf33b9ef18703eedf Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Wed, 18 Mar 2015 16:13:47 -0700
Subject: [PATCH] Add SelfLink to Kubelet http source.

---
 pkg/kubelet/config/file.go      | 2 --
 pkg/kubelet/config/http.go      | 2 ++
 pkg/kubelet/config/http_test.go | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/kubelet/config/file.go b/pkg/kubelet/config/file.go
index f67cd01f8cc..0bd370e8ed1 100644
--- a/pkg/kubelet/config/file.go
+++ b/pkg/kubelet/config/file.go
@@ -197,8 +197,6 @@ func extractFromFile(filename string) (api.Pod, error) {
 	pod.Namespace = kubelet.NamespaceDefault
 	glog.V(5).Infof("Using namespace %q for pod %q from file %s", pod.Namespace, pod.Name, filename)
 
-	// TODO(dchen1107): BoundPod is not type of runtime.Object. Once we allow kubelet talks
-	// about Pod directly, we can use SelfLinker defined in package: latest
 	// Currently just simply follow the same format in resthandler.go
 	pod.ObjectMeta.SelfLink = fmt.Sprintf("/api/v1beta2/pods/%s?namespace=%s",
 		pod.Name, pod.Namespace)
diff --git a/pkg/kubelet/config/http.go b/pkg/kubelet/config/http.go
index 2eb5838b487..54ead0c0e74 100644
--- a/pkg/kubelet/config/http.go
+++ b/pkg/kubelet/config/http.go
@@ -206,5 +206,7 @@ func applyDefaults(pod *api.Pod, url string) error {
 	// Always overrides the namespace.
 	pod.Namespace = kubelet.NamespaceDefault
 	glog.V(5).Infof("Using namespace %q for pod %q from URL %s", pod.Namespace, pod.Name, url)
+	pod.ObjectMeta.SelfLink = fmt.Sprintf("/api/v1beta2/pods/%s?namespace=%s",
+		pod.Name, pod.Namespace)
 	return nil
 }
diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go
index cb09a9f5302..b47b79f8bef 100644
--- a/pkg/kubelet/config/http_test.go
+++ b/pkg/kubelet/config/http_test.go
@@ -137,7 +137,7 @@ func TestExtractFromHTTP(t *testing.T) {
 						UID:       "111",
 						Name:      "foo" + "-" + hostname,
 						Namespace: "foobar",
-						SelfLink:  "/api/v1beta1/pods/foo",
+						SelfLink:  "/api/v1beta2/pods/foo-" + hostname + "?namespace=default",
 					},
 					Spec: api.PodSpec{
 						RestartPolicy: api.RestartPolicyAlways,
@@ -160,6 +160,7 @@ func TestExtractFromHTTP(t *testing.T) {
 						UID:       "111",
 						Name:      "111" + "-" + hostname,
 						Namespace: "foobar",
+						SelfLink:  "/api/v1beta2/pods/111-" + hostname + "?namespace=default",
 					},
 					Spec: api.PodSpec{
 						RestartPolicy: api.RestartPolicyAlways,
@@ -178,7 +179,7 @@ func TestExtractFromHTTP(t *testing.T) {
 						UID:       "111",
 						Name:      "foo" + "-" + hostname,
 						Namespace: "foobar",
-						SelfLink:  "/api/v1beta1/pods/foo",
+						SelfLink:  "/api/v1beta2/pods/foo-" + hostname + "?namespace=default",
 					},
 					Spec: api.PodSpec{
 						RestartPolicy: api.RestartPolicyAlways,
@@ -206,7 +207,7 @@ func TestExtractFromHTTP(t *testing.T) {
 						UID:       "111",
 						Name:      "foo" + "-" + hostname,
 						Namespace: "foobar",
-						SelfLink:  "/api/v1beta1/pods/foo",
+						SelfLink:  "/api/v1beta2/pods/foo-" + hostname + "?namespace=default",
 					},
 					Spec: api.PodSpec{
 						RestartPolicy: api.RestartPolicyAlways,
@@ -223,7 +224,7 @@ func TestExtractFromHTTP(t *testing.T) {
 						UID:       "222",
 						Name:      "bar" + "-" + hostname,
 						Namespace: "foobar",
-						SelfLink:  "/api/v1beta1/pods/bar",
+						SelfLink:  "/api/v1beta2/pods/bar-" + hostname + "?namespace=default",
 					},
 					Spec: api.PodSpec{
 						RestartPolicy: api.RestartPolicyAlways,