scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5622 from vmarmol/http

Browse Source 
Add SelfLink to Kubelet http source.
This commit is contained in:
Yu-Ju Hong
2015-03-18 18:09:05 -07:00
parent 4877f4504d ce96182cc3
commit 05c61d2e47
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/config/file.go
View File

@@ -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)

2
pkg/kubelet/config/http.go
View File

@@ -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
}

9
pkg/kubelet/config/http_test.go
View File

@@ -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,