Merge pull request #1100 from jimmidyson/healthz-readyz-paths

✨ Make individual readiness and liveness checks accessible

Author: k8s-ci-robot

pkg/manager/internal.go

@@ -52,8 +52,8 @@ const (
 	defaultRetryPeriod            = 2 * time.Second
 	defaultGracefulShutdownPeriod = 30 * time.Second
 
-	defaultReadinessEndpoint = "/readyz"
-	defaultLivenessEndpoint  = "/healthz"
+	defaultReadinessEndpoint = "/readyz/"
+	defaultLivenessEndpoint  = "/healthz/"
 	defaultMetricsEndpoint   = "/metrics"
 )
 

pkg/manager/manager_test.go

@@ -24,8 +24,10 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"path"
 	rt "runtime"
 	"runtime/pprof"
+	"strings"
 	"sync"
 	"time"
 
@@ -944,7 +946,8 @@ var _ = Describe("manger.Manager", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			res := fmt.Errorf("not ready yet")
-			err = m.AddReadyzCheck("check", func(_ *http.Request) error { return res })
+			namedCheck := "check"
+			err = m.AddReadyzCheck(namedCheck, func(_ *http.Request) error { return res })
 			Expect(err).NotTo(HaveOccurred())
 
 			s := make(chan struct{})
@@ -967,6 +970,20 @@ var _ = Describe("manger.Manager", func() {
 			resp, err = http.Get(readinessEndpoint)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
+
+			// Check readiness path without trailing slash
+			readinessEndpoint = fmt.Sprint("http://", listener.Addr().String(), strings.TrimSuffix(defaultReadinessEndpoint, "/"))
+			res = nil
+			resp, err = http.Get(readinessEndpoint)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(resp.StatusCode).To(Equal(http.StatusOK))
+
+			// Check readiness path for individual check
+			readinessEndpoint = fmt.Sprint("http://", listener.Addr().String(), path.Join(defaultReadinessEndpoint, namedCheck))
+			res = nil
+			resp, err = http.Get(readinessEndpoint)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 		})
 
 		It("should serve liveness endpoint", func(done Done) {
@@ -975,7 +992,8 @@ var _ = Describe("manger.Manager", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			res := fmt.Errorf("not alive")
-			err = m.AddHealthzCheck("check", func(_ *http.Request) error { return res })
+			namedCheck := "check"
+			err = m.AddHealthzCheck(namedCheck, func(_ *http.Request) error { return res })
 			Expect(err).NotTo(HaveOccurred())
 
 			s := make(chan struct{})
@@ -998,6 +1016,20 @@ var _ = Describe("manger.Manager", func() {
 			resp, err = http.Get(livenessEndpoint)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
+
+			// Check liveness path without trailing slash
+			livenessEndpoint = fmt.Sprint("http://", listener.Addr().String(), strings.TrimSuffix(defaultLivenessEndpoint, "/"))
+			res = nil
+			resp, err = http.Get(livenessEndpoint)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(resp.StatusCode).To(Equal(http.StatusOK))
+
+			// Check readiness path for individual check
+			livenessEndpoint = fmt.Sprint("http://", listener.Addr().String(), path.Join(defaultLivenessEndpoint, namedCheck))
+			res = nil
+			resp, err = http.Get(livenessEndpoint)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 		})
 	})