31a415c83a
The exec command as extracted from the query comprises only the first part of the command and does not include potentially supplied parameters. E.g., $ kubectl exec pod -- ls -t /usr > command: ls This change fixes the problem by moving away from the Query.Get API. $ kubectl exec pod -- ls -t /usr > command: [ls -t /usr]
104 lines
2.6 KiB
Go
104 lines
2.6 KiB
Go
package vkubelet
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"log"
|
|
"net/http"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gorilla/mux"
|
|
"k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
|
|
)
|
|
|
|
var p Provider
|
|
var r mux.Router
|
|
|
|
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) {
|
|
p = provider
|
|
certFilePath := os.Getenv("APISERVER_CERT_LOCATION")
|
|
keyFilePath := os.Getenv("APISERVER_KEY_LOCATION")
|
|
port := os.Getenv("KUBELET_PORT")
|
|
addr := fmt.Sprintf(":%s", port)
|
|
|
|
r := mux.NewRouter()
|
|
r.HandleFunc("/containerLogs/{namespace}/{pod}/{container}", ApiServerHandler).Methods("GET")
|
|
r.HandleFunc("/exec/{namespace}/{pod}/{container}", ApiServerHandlerExec).Methods("POST")
|
|
r.NotFoundHandler = http.HandlerFunc(NotFound)
|
|
|
|
if err := http.ListenAndServeTLS(addr, certFilePath, keyFilePath, r); err != nil {
|
|
log.Println(err)
|
|
}
|
|
}
|
|
|
|
func ApiServerHandler(w http.ResponseWriter, req *http.Request) {
|
|
vars := mux.Vars(req)
|
|
if len(vars) == 3 {
|
|
namespace := vars["namespace"]
|
|
pod := vars["pod"]
|
|
container := vars["container"]
|
|
tail := 10
|
|
q := req.URL.Query()
|
|
queryTail := q.Get("tailLines")
|
|
if queryTail != "" {
|
|
t, err := strconv.Atoi(queryTail)
|
|
if err != nil {
|
|
log.Println(err)
|
|
io.WriteString(w, err.Error())
|
|
} else {
|
|
tail = t
|
|
}
|
|
}
|
|
podsLogs, err := p.GetContainerLogs(namespace, pod, container, tail)
|
|
if err != nil {
|
|
log.Println(err)
|
|
io.WriteString(w, err.Error())
|
|
} else {
|
|
io.WriteString(w, podsLogs)
|
|
}
|
|
} else {
|
|
NotFound(w, req)
|
|
}
|
|
}
|
|
|
|
func ApiServerHandlerExec(w http.ResponseWriter, req *http.Request) {
|
|
vars := mux.Vars(req)
|
|
|
|
namespace := vars["namespace"]
|
|
pod := vars["pod"]
|
|
container := vars["container"]
|
|
|
|
supportedStreamProtocols := strings.Split(req.Header.Get("X-Stream-Protocol-Version"), ",")
|
|
|
|
q := req.URL.Query()
|
|
command := q["command"]
|
|
|
|
// streamOpts := &remotecommand.Options{
|
|
// Stdin: (q.Get("input") == "1"),
|
|
// Stdout: (q.Get("output") == "1"),
|
|
// Stderr: (q.Get("error") == "1"),
|
|
// TTY: (q.Get("tty") == "1"),
|
|
// }
|
|
|
|
// TODO: tty flag causes remotecommand.createStreams to wait for the wrong number of streams
|
|
streamOpts := &remotecommand.Options{
|
|
Stdin: true,
|
|
Stdout: true,
|
|
Stderr: true,
|
|
TTY: false,
|
|
}
|
|
|
|
idleTimeout := time.Second * 30
|
|
streamCreationTimeout := time.Second * 30
|
|
|
|
remotecommand.ServeExec(w, req, p, fmt.Sprintf("%s-%s", namespace, pod), "", container, command, streamOpts, idleTimeout, streamCreationTimeout, supportedStreamProtocols)
|
|
}
|