Merge pull request #47729 from paultyng/pt/useragent

Automatic merge from submit-queue (batch tested with PRs 47286, 47729)

Set default User-Agent on http probe

**Set a default User-Agent on `httpGet` probes**:

Currently the default Go HTTP client sets a `User-Agent` specific to the language and version, but every Go client has the same one.  In Kubernetes, users can override the User-Agent by setting a header in their probe definition, but its tedious to do this everywhere.

This PR changes the default User-Agent only if not set (or removed) in the probe definition.

**Which issue this PR fixes** 
fixes #29025

**Special notes for your reviewer**:

**Release note**:

```release-note
Change default `httpGet` probe `User-Agent` to `kube-probe/<version major.minor>` if none specified, overriding the default Go `User-Agent`.
```

pkg/probe/http/BUILD

@@ -14,6 +14,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/probe:go_default_library",
+        "//pkg/version:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
     ],

pkg/probe/http/http.go

@@ -26,6 +26,7 @@ import (
 
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/kubernetes/pkg/probe"
+	"k8s.io/kubernetes/pkg/version"
 
 	"github.com/golang/glog"
 )
@@ -68,6 +69,14 @@ func DoHTTPProbe(url *url.URL, headers http.Header, client HTTPGetInterface) (pr
 		// Convert errors into failures to catch timeouts.
 		return probe.Failure, err.Error(), nil
 	}
+	if _, ok := headers["User-Agent"]; !ok {
+		if headers == nil {
+			headers = http.Header{}
+		}
+		// explicitly set User-Agent so it's not set to default Go value
+		v := version.Get()
+		headers.Set("User-Agent", fmt.Sprintf("kube-probe/%s.%s", v.Major, v.Minor))
+	}
 	req.Header = headers
 	if headers.Get("Host") != "" {
 		req.Host = headers.Get("Host")

pkg/probe/http/http_test.go

@@ -40,22 +40,8 @@ func TestHTTPProbeChecker(t *testing.T) {
 		}
 	}
 
-	prober := New()
-	testCases := []struct {
-		handler    func(w http.ResponseWriter, r *http.Request)
-		reqHeaders http.Header
-		health     probe.Result
-		accBody    string
-	}{
-		// The probe will be filled in below.  This is primarily testing that an HTTP GET happens.
-		{
-			handler: handleReq(http.StatusOK, "ok body"),
-			health:  probe.Success,
-			accBody: "ok body",
-		},
-		{
 	// Echo handler that returns the contents of request headers in the body
-			handler: func(w http.ResponseWriter, r *http.Request) {
+	headerEchoHandler := func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 		output := ""
 		for k, arr := range r.Header {
@@ -64,13 +50,52 @@ func TestHTTPProbeChecker(t *testing.T) {
 			}
 		}
 		w.Write([]byte(output))
+	}
+
+	prober := New()
+	testCases := []struct {
+		handler    func(w http.ResponseWriter, r *http.Request)
+		reqHeaders http.Header
+		health     probe.Result
+		accBody    string
+		notBody    string
+	}{
+		// The probe will be filled in below.  This is primarily testing that an HTTP GET happens.
+		{
+			handler: handleReq(http.StatusOK, "ok body"),
+			health:  probe.Success,
+			accBody: "ok body",
 		},
+		{
+			handler: headerEchoHandler,
 			reqHeaders: http.Header{
 				"X-Muffins-Or-Cupcakes": {"muffins"},
 			},
 			health:  probe.Success,
 			accBody: "X-Muffins-Or-Cupcakes: muffins",
 		},
+		{
+			handler: headerEchoHandler,
+			reqHeaders: http.Header{
+				"User-Agent": {"foo/1.0"},
+			},
+			health:  probe.Success,
+			accBody: "User-Agent: foo/1.0",
+		},
+		{
+			handler: headerEchoHandler,
+			reqHeaders: http.Header{
+				"User-Agent": {""},
+			},
+			health:  probe.Success,
+			notBody: "User-Agent",
+		},
+		{
+			handler:    headerEchoHandler,
+			reqHeaders: http.Header{},
+			health:     probe.Success,
+			accBody:    "User-Agent: kube-probe/",
+		},
 		{
 			// Echo handler that returns the contents of Host in the body
 			handler: func(w http.ResponseWriter, r *http.Request) {
@@ -130,6 +155,9 @@ func TestHTTPProbeChecker(t *testing.T) {
 				if !strings.Contains(output, test.accBody) {
 					t.Errorf("Expected response body to contain %v, got %v", test.accBody, output)
 				}
+				if test.notBody != "" && strings.Contains(output, test.notBody) {
+					t.Errorf("Expected response not to contain %v, got %v", test.notBody, output)
+				}
 			}
 		}()
 	}