github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4473 from xiang90/server

Browse Source 
pkg/kubelet/server.go: minor fixes
This commit is contained in:
Dawn Chen
2015-02-18 14:50:51 -08:00
parent 6bbde837b8 6b91901bd3
commit 8022c74b55
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/server.go
View File

@@ -130,18 +130,14 @@ func isValidDockerVersion(ver []uint) (bool, string) {
func (s *Server) handleHealthz(w http.ResponseWriter, req *http.Request) {
versions, err := s.host.GetDockerVersion()
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte("unknown Docker version"))
s.error(w, errors.New("unknown Docker version"))
return
}
valid, version := isValidDockerVersion(versions)
if !valid {
w.WriteHeader(http.StatusInternalServerError)
msg := "Docker version is too old (" + version + ")"
w.Write([]byte(msg))
s.error(w, errors.New("Docker version is too old ("+version+")"))
return
}
w.WriteHeader(http.StatusOK)
w.Write([]byte("ok"))
}
@@ -230,7 +226,6 @@ func (s *Server) handleBoundPods(w http.ResponseWriter, req *http.Request) {
s.error(w, err)
return
}
w.WriteHeader(http.StatusOK)
w.Header().Add("Content-type", "application/json")
w.Write(data)
}
@@ -254,12 +249,10 @@ func (s *Server) handlePodStatus(w http.ResponseWriter, req *http.Request, versi
podUID := types.UID(u.Query().Get("UUID"))
podNamespace := u.Query().Get("podNamespace")
if len(podID) == 0 {
w.WriteHeader(http.StatusBadRequest)
http.Error(w, "Missing 'podID=' query entry.", http.StatusBadRequest)
return
}
if len(podNamespace) == 0 {
w.WriteHeader(http.StatusBadRequest)
http.Error(w, "Missing 'podNamespace=' query entry.", http.StatusBadRequest)
return
}
@@ -278,7 +271,6 @@ func (s *Server) handlePodStatus(w http.ResponseWriter, req *http.Request, versi
s.error(w, err)
return
}
w.WriteHeader(http.StatusOK)
w.Header().Add("Content-type", "application/json")
w.Write(data)
}
@@ -307,7 +299,6 @@ func (s *Server) handleSpec(w http.ResponseWriter, req *http.Request) {
}
w.Header().Add("Content-type", "application/json")
w.Write(data)
}
// handleRun handles requests to run a command inside a container.
@@ -380,7 +371,7 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
case 2:
// pod stats
// TODO(monnand) Implement this
errors.New("pod level status currently unimplemented")
err = errors.New("pod level status currently unimplemented")
case 3:
// Backward compatibility without uid information, does not support namespace
pod, ok := s.host.GetPodByName(api.NamespaceDefault, components[1])
@@ -411,7 +402,6 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
return
}
if stats == nil {
w.WriteHeader(http.StatusOK)
fmt.Fprint(w, "{}")
return
}
@@ -420,7 +410,6 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
s.error(w, err)
return
}
w.WriteHeader(http.StatusOK)
w.Header().Add("Content-type", "application/json")
w.Write(data)
return