Skip to content

K
k3s
Commit de513318 authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Merge pull request #435 from claire921/kubelet_server

pkg/kubelet: clean up server http error handling
parents 1603e17c cdc44387
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 16 deletions
pkg/kubelet/kubelet_server.go
View file @ de513318
...@@ -46,8 +46,7 @@ type kubeletInterface interface { ...@@ -46,8 +46,7 @@ type kubeletInterface interface {
} }
func (s *KubeletServer) error(w http.ResponseWriter, err error) { func (s *KubeletServer) error(w http.ResponseWriter, err error) {
w.WriteHeader(http.StatusInternalServerError) http.Error(w, fmt.Sprintf("Internal Error: %v", err), http.StatusInternalServerError)
fmt.Fprintf(w, "Internal Error: %v", err)
} }
func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
...@@ -87,20 +86,17 @@ func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { ...@@ -87,20 +86,17 @@ func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
case u.Path == "/podInfo": case u.Path == "/podInfo":
podID := u.Query().Get("podID") podID := u.Query().Get("podID")
if len(podID) == 0 { if len(podID) == 0 {
w.WriteHeader(http.StatusBadRequest) http.Error(w, "Missing 'podID=' query entry.", http.StatusBadRequest)
fmt.Fprint(w, "Missing 'podID=' query entry.")
return return
} }
info, err := s.Kubelet.GetPodInfo(podID) info, err := s.Kubelet.GetPodInfo(podID)
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) s.error(w, err)
fmt.Fprintf(w, "Internal Error: %v", err)
return return
} }
data, err := json.Marshal(info) data, err := json.Marshal(info)
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) s.error(w, err)
fmt.Fprintf(w, "Internal Error: %v", err)
return return
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
...@@ -109,8 +105,7 @@ func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { ...@@ -109,8 +105,7 @@ func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
case strings.HasPrefix(u.Path, "/stats"): case strings.HasPrefix(u.Path, "/stats"):
s.serveStats(w, req) s.serveStats(w, req)
default: default:
w.WriteHeader(http.StatusNotFound) http.Error(w, "Not found.", http.StatusNotFound)
fmt.Fprint(w, "Not found.")
} }
} }
...@@ -130,13 +125,11 @@ func (s *KubeletServer) serveStats(w http.ResponseWriter, req *http.Request) { ...@@ -130,13 +125,11 @@ func (s *KubeletServer) serveStats(w http.ResponseWriter, req *http.Request) {
case 3: case 3:
stats, err = s.Kubelet.GetContainerStats(components[1], components[2]) stats, err = s.Kubelet.GetContainerStats(components[1], components[2])
default: default:
w.WriteHeader(http.StatusNotFound) http.Error(w, "unknown resource.", http.StatusNotFound)
fmt.Fprint(w, "unknown resource.")
return return
} }
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) s.error(w, err)
fmt.Fprintf(w, "Internal Error: %v", err)
return return
} }
if stats == nil { if stats == nil {
...@@ -146,8 +139,7 @@ func (s *KubeletServer) serveStats(w http.ResponseWriter, req *http.Request) { ...@@ -146,8 +139,7 @@ func (s *KubeletServer) serveStats(w http.ResponseWriter, req *http.Request) {
} }
data, err := json.Marshal(stats) data, err := json.Marshal(stats)
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) s.error(w, err)
fmt.Fprintf(w, "Internal Error: %v", err)
return return
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment