Merge pull request kubernetes#24522 from errm/automated-cherry-pick-o…

…f-#24292-upstream-release-1.2 Automated cherry pick of kubernetes#24292
shouhong · Apr 20, 2016 · 7edb618 · 7edb618
2 parents 403d74e + d151af1
commit 7edb618
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pkg/probe/http/http.go b/pkg/probe/http/http.go
@@ -63,6 +63,9 @@ func DoHTTPProbe(url *url.URL, headers http.Header, client HTTPGetInterface) (pr
 		return probe.Failure, err.Error(), nil
 	}
 	req.Header = headers
+	if headers.Get("Host") != "" {
+		req.Host = headers.Get("Host")
+	}
 	res, err := client.Do(req)
 	if err != nil {
 		// Convert errors into failures to catch timeouts.

diff --git a/pkg/probe/http/http_test.go b/pkg/probe/http/http_test.go
@@ -85,6 +85,20 @@ func TestHTTPProbeChecker(t *testing.T) {
 				"X-Muffins-Or-Cupcakes: muffins",
 			},
 		},
+		{
+			// Echo handler that returns the contents of Host in the body
+			func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(200)
+				w.Write([]byte(r.Host))
+			},
+			http.Header{
+				"Host": {"muffins.cupcakes.org"},
+			},
+			probe.Success,
+			[]string{
+				"muffins.cupcakes.org",
+			},
+		},
 		{
 			handleReq(FailureCode, "fail body"),
 			nil,