d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fill in Default Values for CPU/Memory (#130)

Browse Source 
Update k8s client and the dependencies
ACI client change for Mocking
Add ACI Provider Mock Tests
Add the Windows development environment
Add UT for Default Resource Requests
Enable the make test in Docker file
Update the vendors
This commit is contained in:
Robbie Zhang
2018-04-16 10:31:16 -07:00
committed by GitHub
parent 88bafc701b
commit 2b85b0d1df
862 changed files with 61483 additions and 16781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vkubelet/apiserver.go
View File

@@ -6,16 +6,16 @@ import (
"log"
"net/http"
"os"
"strconv"
"strconv"
"github.com/gorilla/mux"
)
var p Provider
var r mux.Router
func NotFound(w http.ResponseWriter, r *http.Request) {
log.Println("404 request not found")
http.Error(w, "404 request not found", http.StatusNotFound)
func NotFound(w http.ResponseWriter, r *http.Request) {
log.Printf("404 request not found. \n %v", mux.Vars(r))
http.Error(w, "404 request not found", http.StatusNotFound)
}
func ApiserverStart(provider Provider) {
@@ -29,8 +29,7 @@ func ApiserverStart(provider Provider) {
r.HandleFunc("/containerLogs/{namespace}/{pod}/{container}", ApiServerHandler).Methods("GET")
r.NotFoundHandler = http.HandlerFunc(NotFound)
err := http.ListenAndServeTLS(addr, certFilePath, keyFilePath, r)
if err != nil {
if err := http.ListenAndServeTLS(addr, certFilePath, keyFilePath, r); err != nil {
log.Println(err)
}
}
@@ -48,7 +47,7 @@ func ApiServerHandler(w http.ResponseWriter, req *http.Request) {
t, err := strconv.Atoi(queryTail)
if err != nil {
log.Println(err)
io.WriteString(w, err.Error())
io.WriteString(w, err.Error())
} else {
tail = t
}
@@ -56,7 +55,7 @@ func ApiServerHandler(w http.ResponseWriter, req *http.Request) {
podsLogs, err := p.GetContainerLogs(namespace, pod, container, tail)
if err != nil {
log.Println(err)
io.WriteString(w, err.Error())
io.WriteString(w, err.Error())
} else {
io.WriteString(w, podsLogs)
}