Merge pull request #1724 from cybertron/haproxy-readyz

Bug 1823950: [baremetal] Switch to /readyz for haproxy healthchecking
openshift · May 14, 2020 · ce9eadd · ce9eadd
2 parents 010ac67 + 022933c
commit ce9eadd
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/templates/master/00-master/baremetal/files/baremetal-haproxy-haproxy.yaml b/templates/master/00-master/baremetal/files/baremetal-haproxy-haproxy.yaml
@@ -21,7 +21,7 @@ contents:
     listen health_check_http_url
       bind :::50936 v4v6
       mode http
-      monitor-uri /healthz
+      monitor-uri /readyz
       option dontlognull
     listen stats
       bind localhost:{{`{{ .LBConfig.StatPort }}`}}
@@ -32,7 +32,7 @@ contents:
       stats refresh 30s
       stats auth Username:Password
     backend masters
-       option  httpchk GET /healthz HTTP/1.0
+       option  httpchk GET /readyz HTTP/1.0
        option  log-health-checks
        balance roundrobin
     {{`{{- range .LBConfig.Backends }}

diff --git a/templates/master/00-master/baremetal/files/baremetal-haproxy.yaml b/templates/master/00-master/baremetal/files/baremetal-haproxy.yaml
@@ -101,7 +101,7 @@ contents:
         livenessProbe:
           initialDelaySeconds: 10
           httpGet:
-            path: /healthz
+            path: /readyz
             port: 50936
         terminationMessagePolicy: FallbackToLogsOnError
         imagePullPolicy: IfNotPresent

diff --git a/templates/master/00-master/openstack/files/openstack-haproxy-haproxy.yaml b/templates/master/00-master/openstack/files/openstack-haproxy-haproxy.yaml
@@ -22,7 +22,7 @@ contents:
     listen health_check_http_url
       bind :::50936 v4v6
       mode http
-      monitor-uri /healthz
+      monitor-uri /readyz
       option dontlognull
     listen stats
       bind localhost:{{`{{ .LBConfig.StatPort }}`}}
@@ -33,7 +33,7 @@ contents:
       stats refresh 30s
       stats auth Username:Password
     backend masters
-       option  httpchk GET /healthz HTTP/1.0
+       option  httpchk GET /readyz HTTP/1.0
        option  log-health-checks
        balance roundrobin
     {{`{{- range .LBConfig.Backends }}

diff --git a/templates/master/00-master/openstack/files/openstack-haproxy.yaml b/templates/master/00-master/openstack/files/openstack-haproxy.yaml
@@ -99,7 +99,7 @@ contents:
         livenessProbe:
           initialDelaySeconds: 10
           httpGet:
-            path: /healthz
+            path: /readyz
             port: 50936
         terminationMessagePolicy: FallbackToLogsOnError
         imagePullPolicy: IfNotPresent

diff --git a/templates/master/00-master/ovirt/files/ovirt-haproxy-haproxy.yaml b/templates/master/00-master/ovirt/files/ovirt-haproxy-haproxy.yaml
@@ -21,7 +21,7 @@ contents:
     listen health_check_http_url
       bind :::50936 v4v6
       mode http
-      monitor-uri /healthz
+      monitor-uri /readyz
       option dontlognull
     listen stats
       bind 127.0.0.1:{{`{{ .LBConfig.StatPort }}`}}
@@ -32,7 +32,7 @@ contents:
       stats refresh 30s
       stats auth Username:Password
     backend masters
-       option  httpchk GET /healthz HTTP/1.0
+       option  httpchk GET /readyz HTTP/1.0
        option  log-health-checks
        balance roundrobin
     {{`{{- range .LBConfig.Backends }}

diff --git a/templates/master/00-master/ovirt/files/ovirt-haproxy.yaml b/templates/master/00-master/ovirt/files/ovirt-haproxy.yaml
@@ -79,7 +79,7 @@ contents:
         livenessProbe:
           initialDelaySeconds: 10
           httpGet:
-            path: /healthz
+            path: /readyz
             port: 50936
         terminationMessagePolicy: FallbackToLogsOnError
         imagePullPolicy: IfNotPresent

diff --git a/templates/master/00-master/vsphere/files/vsphere-haproxy-haproxy.yaml b/templates/master/00-master/vsphere/files/vsphere-haproxy-haproxy.yaml
@@ -25,7 +25,7 @@ contents:
     listen health_check_http_url
       bind :::50936 v4v6
       mode http
-      monitor-uri /healthz
+      monitor-uri /readyz
       option dontlognull
     listen stats
       bind localhost:{{`{{ .LBConfig.StatPort }}`}}
@@ -36,7 +36,7 @@ contents:
       stats refresh 30s
       stats auth Username:Password
     backend masters
-       option  httpchk GET /healthz HTTP/1.0
+       option  httpchk GET /readyz HTTP/1.0
        option  log-health-checks
        balance roundrobin
     {{`{{- range .LBConfig.Backends }}

diff --git a/templates/master/00-master/vsphere/files/vsphere-haproxy.yaml b/templates/master/00-master/vsphere/files/vsphere-haproxy.yaml
@@ -105,7 +105,7 @@ contents:
         livenessProbe:
           initialDelaySeconds: 10
           httpGet:
-            path: /healthz
+            path: /readyz
             port: 50936
         terminationMessagePolicy: FallbackToLogsOnError
         imagePullPolicy: IfNotPresent