router: readiness url /readyz -> /ready

Author: marun

images/router/haproxy/conf/haproxy-config.template

@@ -70,8 +70,8 @@ defaults
 
 {{ if (matchPattern "true|TRUE" (env "ROUTER_ENABLE_COMPRESSION" "false")) }}
   compression algo gzip
-  {{ with  $mimeType := (env "ROUTER_COMPRESSION_MIME" "text/html text/plain text/css") }}  
-  compression type {{$mimeType}}  
+  {{ with  $mimeType := (env "ROUTER_COMPRESSION_MIME" "text/html text/plain text/css") }}
+  compression type {{$mimeType}}
   {{end}}
 {{end}}
 
@@ -85,7 +85,7 @@ listen stats :1936
     monitor-uri /healthz
 {{ if .SyncedAtLeastOnce }}
     # This uri being configured indicates that routing configuration has been synchronized.
-    monitor-uri /readyz
+    monitor-uri /ready
 {{ end }}
 
 {{ if and (and (ne .StatsUser "") (ne .StatsPassword "")) (gt .StatsPort 0) }}
@@ -335,19 +335,19 @@ backend be_edge_http_{{$cfgIdx}}
 {{ if matchPattern "true|TRUE" (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections") }}
   stick-table type ip size 100k expire 30s store conn_cur,conn_rate(3s),http_req_rate(10s)
   tcp-request content track-sc2 src
-  {{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.concurrent-tcp")) }} 
+  {{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.concurrent-tcp")) }}
   tcp-request content reject if { src_conn_cur ge  {{ index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.concurrent-tcp" }} }
   {{ else }}
   # concurrent TCP connections not restricted
   {{ end }}
 
-  {{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-tcp")) }} 
+  {{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-tcp")) }}
   tcp-request content reject if { src_conn_rate ge {{ index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-tcp" }} }
   {{ else }}
   #TCP connection rate not restricted
   {{ end }}
 
-  {{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-http")) }} 
+  {{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-http")) }}
   tcp-request content reject if { src_http_req_rate ge {{ index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-http" }} }
   {{ else }}
   #HTTP request rate not restricted

pkg/cmd/admin/router/router.go

@@ -427,7 +427,7 @@ func generateLivenessProbeConfig(cfg *RouterConfig, ports []kapi.ContainerPort)
 }
 
 func generateReadinessProbeConfig(cfg *RouterConfig, ports []kapi.ContainerPort) *kapi.Probe {
-	probe := generateProbeConfigForRouter(cfg, ports, "/readyz")
+	probe := generateProbeConfigForRouter(cfg, ports, "/ready")
 	if probe != nil {
 		probe.InitialDelaySeconds = 10
 	}

test/integration/router_test.go

@@ -1599,7 +1599,7 @@ func waitForRouterToBecomeAvailable(host string, port int) error {
 
 // waitForRouterToBecomeReady checks that the router is ready.
 func waitForRouterToBecomeReady(host string, port int) error {
-	return waitForRouter(host, port, "readyz")
+	return waitForRouter(host, port, "ready")
 }
 
 func makeRouterRequest(t *testing.T, scheme string) (*http.Response, error) {