From 6f73314199fea2c9d0314df053046a1056d97c5b Mon Sep 17 00:00:00 2001 From: Craig Furman Date: Mon, 11 Feb 2019 17:38:30 +0000 Subject: [PATCH] Webhook server uses its configured host if set --- pkg/webhook/server.go | 7 ++++++- pkg/webhook/server_test.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/webhook/server.go b/pkg/webhook/server.go index 180a2b538f..fed2c3a38a 100644 --- a/pkg/webhook/server.go +++ b/pkg/webhook/server.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "io" + "net" "net/http" "path" "sync" @@ -218,9 +219,13 @@ func (s *Server) Start(stop <-chan struct{}) error { func (s *Server) run(stop <-chan struct{}) error { // nolint: gocyclo errCh := make(chan error) + host := "" + if s.Host != nil { + host = *s.Host + } serveFn := func() { s.httpServer = &http.Server{ - Addr: fmt.Sprintf(":%v", s.Port), + Addr: net.JoinHostPort(host, fmt.Sprintf("%d", s.Port)), Handler: s.sMux, } log.Info("starting the webhook server.") diff --git a/pkg/webhook/server_test.go b/pkg/webhook/server_test.go index ff660cb3cd..2325966044 100644 --- a/pkg/webhook/server_test.go +++ b/pkg/webhook/server_test.go @@ -49,7 +49,7 @@ var _ = Describe("webhook server", func() { Describe("run", func() { var stop chan struct{} var s *Server - var cn = "example.com" + var cn = "localhost" BeforeEach(func() { port, _, err := addr.Suggest()