github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1646 from dchen1107/termination 

Fix an issue on GetContainerInfo.
pull/6/head
Tim Hockin 2014-10-07 17:27:56 -07:00
parent 0d2ce69574 300c2c5f6f
commit 2f2ef05fa8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/server.go
View File

@ -318,9 +318,11 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
errors.New("pod level status currently unimplemented")
case 3:
// Backward compatibility without uuid information
stats, err = s.host.GetContainerInfo(components[1], "", components[2], &query)
podFullName := GetPodFullName(&Pod{Name: components[1], Namespace: "etcd"})
stats, err = s.host.GetContainerInfo(podFullName, "", components[2], &query)
case 4:
stats, err = s.host.GetContainerInfo(components[1], components[2], components[2], &query)
podFullName := GetPodFullName(&Pod{Name: components[1], Namespace: "etcd"})
stats, err = s.host.GetContainerInfo(podFullName, components[2], components[2], &query)
default:
http.Error(w, "unknown resource.", http.StatusNotFound)
return

5
pkg/kubelet/server_test.go
View File

@ -174,7 +174,8 @@ func TestPodInfo(t *testing.T) {
func TestContainerInfo(t *testing.T) {
fw := newServerTest()
expectedInfo := &info.ContainerInfo{}
expectedPodID := "somepod"
podID := "somepod"
expectedPodID := "somepod" + ".etcd"
expectedContainerName := "goodcontainer"
fw.fakeKubelet.containerInfoFunc = func(podID, containerName string, req *info.ContainerInfoRequest) (*info.ContainerInfo, error) {
if podID != expectedPodID || containerName != expectedContainerName {
@ -183,7 +184,7 @@ func TestContainerInfo(t *testing.T) {
return expectedInfo, nil
}
resp, err := http.Get(fw.testHTTPServer.URL + fmt.Sprintf("/stats/%v/%v", expectedPodID, expectedContainerName))
resp, err := http.Get(fw.testHTTPServer.URL + fmt.Sprintf("/stats/%v/%v", podID, expectedContainerName))
if err != nil {
t.Fatalf("Got error GETing: %v", err)
}