Merge pull request #314 from nicksardo/echo-version

Add server version to echo
kubernetes · Jun 6, 2018 · 8f83638 · 8f83638
2 parents 0905182 + c48d5cd
commit 8f83638
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/cmd/echo/app/handlers.go b/cmd/echo/app/handlers.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"k8s.io/ingress-gce/pkg/version"
 )
 
 const (
@@ -80,21 +81,23 @@ func echo(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 
 	var dump = struct {
-		Method      string              `json:"method"`
-		URI         string              `json:"uri"`
-		HTTPVersion string              `json:"httpVersion"`
-		K8sEnv      Env                 `json:"k8sEnv"`
-		RemoteAddr  string              `json:"remoteAddr"`
-		TLS         bool                `json:"tls"`
-		Header      map[string][]string `json:"header"`
+		Method        string              `json:"method"`
+		URI           string              `json:"uri"`
+		HTTPVersion   string              `json:"httpVersion"`
+		K8sEnv        Env                 `json:"k8sEnv"`
+		RemoteAddr    string              `json:"remoteAddr"`
+		TLS           bool                `json:"tls"`
+		Header        map[string][]string `json:"header"`
+		ServerVersion string              `json:"serverVersion"`
 	}{
-		Method:      r.Method,
-		URI:         r.RequestURI,
-		HTTPVersion: fmt.Sprintf("%d.%d", r.ProtoMajor, r.ProtoMinor),
-		K8sEnv:      E,
-		RemoteAddr:  r.RemoteAddr,
-		Header:      r.Header,
-		TLS:         r.TLS != nil,
+		Method:        r.Method,
+		URI:           r.RequestURI,
+		HTTPVersion:   fmt.Sprintf("%d.%d", r.ProtoMajor, r.ProtoMinor),
+		K8sEnv:        E,
+		RemoteAddr:    r.RemoteAddr,
+		Header:        r.Header,
+		TLS:           r.TLS != nil,
+		ServerVersion: version.Version,
 	}
 
 	dumpData, err := json.MarshalIndent(dump, "", "\t")

diff --git a/cmd/echo/main.go b/cmd/echo/main.go
@@ -20,12 +20,15 @@ import (
 	"context"
 	"flag"
 
+	"github.com/golang/glog"
 	"k8s.io/ingress-gce/cmd/echo/app"
+	"k8s.io/ingress-gce/pkg/version"
 )
 
 func main() {
 	app.RegisterFlags()
 	flag.Parse()
 
+	glog.V(0).Infof("Starting echo: %q", version.Version)
 	app.RunHTTPServer(context.Background())
 }