Skip to content

fix: Reponse with correct content-type #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shouren wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Reponse with correct content-type #1604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions pkg/scheduler/routes/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,29 @@ func PredicateRoute(s *scheduler.Scheduler) httprouter.Handle {
// Poll may return false when context is cancelled
err := fmt.Errorf("context cancelled")
klog.ErrorS(err, "Cache not synced, cannot proceed with filtering")
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(err.Error()))
return
}
extenderFilterResult, err = s.Filter(extenderArgs)
if err != nil {
klog.ErrorS(err, "Filter error for pod", "pod", extenderArgs.Pod.Name)
extenderFilterResult = &extenderv1.ExtenderFilterResult{
Error: err.Error(),
}
} else {
extenderFilterResult, err = s.Filter(extenderArgs)
if err != nil {
klog.ErrorS(err, "Filter error for pod", "pod", extenderArgs.Pod.Name)
extenderFilterResult = &extenderv1.ExtenderFilterResult{
Error: err.Error(),
}
}
}
}

if resultBody, err := json.Marshal(extenderFilterResult); err != nil {
klog.ErrorS(err, "Failed to marshal extender filter result", "result", extenderFilterResult)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(err.Error()))
extenderFilterResult = &extenderv1.ExtenderFilterResult{
Error: fmt.Sprintf("Failed to marshal extender filter result: %s", err.Error()),
}
resultBody, _ = json.Marshal(extenderFilterResult)
w.Write(resultBody)
} else {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
Expand Down Expand Up @@ -114,8 +118,11 @@ func Bind(s *scheduler.Scheduler) httprouter.Handle {
klog.ErrorS(err, "Failed to marshal binding result", "result", extenderBindingResult)
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusInternalServerError)
errMsg := fmt.Sprintf("{'error':'%s'}", err.Error())
w.Write([]byte(errMsg))
extenderBindingResult = &extenderv1.ExtenderBindingResult{
Error: fmt.Sprintf("Failed to marshal binding result: %s", err.Error()),
}
response, _ := json.Marshal(extenderBindingResult)
w.Write(response)
} else {
klog.V(5).InfoS("Returning bind response", "result", extenderBindingResult)
w.Header().Set("Content-Type", "application/json")
Expand Down