diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml index 74ff31922debf..a7d37958c42bd 100644 --- a/manifests/ha/base/redis-ha/chart/upstream.yaml +++ b/manifests/ha/base/redis-ha/chart/upstream.yaml @@ -1,4 +1,3 @@ -# This is an auto-generated file. DO NOT EDIT --- # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml apiVersion: v1 @@ -155,9 +154,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE0 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # Check Sentinel and whether they are nominated master backend check_if_redis_is_master_1 mode tcp @@ -169,9 +168,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE1 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # Check Sentinel and whether they are nominated master backend check_if_redis_is_master_2 mode tcp @@ -183,9 +182,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE2 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # decide redis backend to use #master @@ -204,11 +203,11 @@ data: tcp-check send QUIT\r\n tcp-check expect string +OK use-server R0 if { srv_is_up(R0) } { nbsrv(check_if_redis_is_master_0) ge 2 } - server R0 argocd-redis-ha-announce-0:6379 check inter 1s fall 1 rise 1 + server R0 argocd-redis-ha-announce-0:6379 check inter 3s fall 1 rise 1 use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1) ge 2 } - server R1 argocd-redis-ha-announce-1:6379 check inter 1s fall 1 rise 1 + server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise 1 use-server R2 if { srv_is_up(R2) } { nbsrv(check_if_redis_is_master_2) ge 2 } - server R2 argocd-redis-ha-announce-2:6379 check inter 1s fall 1 rise 1 + server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1 haproxy_init.sh: | HAPROXY_CONF=/data/haproxy.cfg cp /readonly/haproxy.cfg "$HAPROXY_CONF" diff --git a/manifests/ha/base/redis-ha/generate.sh b/manifests/ha/base/redis-ha/generate.sh index d93998bced27a..0777b49a23ec0 100755 --- a/manifests/ha/base/redis-ha/generate.sh +++ b/manifests/ha/base/redis-ha/generate.sh @@ -16,4 +16,6 @@ helm2 template ./chart \ --name argocd \ --values ./chart/values.yaml \ ${helm_execute} \ - >> ./chart/upstream.yaml + >> ./chart/upstream_orig.yaml + +sed -e 's/check inter 1s/check inter 3s/' ./chart/upstream_orig.yaml > ./chart/upstream.yaml && rm ./chart/upstream_orig.yaml diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 6869230edfb25..6b53e680350dd 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -2230,9 +2230,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE0 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # Check Sentinel and whether they are nominated master backend check_if_redis_is_master_1 mode tcp @@ -2244,9 +2244,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE1 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # Check Sentinel and whether they are nominated master backend check_if_redis_is_master_2 mode tcp @@ -2258,9 +2258,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE2 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # decide redis backend to use #master @@ -2279,11 +2279,11 @@ data: tcp-check send QUIT\r\n tcp-check expect string +OK use-server R0 if { srv_is_up(R0) } { nbsrv(check_if_redis_is_master_0) ge 2 } - server R0 argocd-redis-ha-announce-0:6379 check inter 1s fall 1 rise 1 + server R0 argocd-redis-ha-announce-0:6379 check inter 3s fall 1 rise 1 use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1) ge 2 } - server R1 argocd-redis-ha-announce-1:6379 check inter 1s fall 1 rise 1 + server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise 1 use-server R2 if { srv_is_up(R2) } { nbsrv(check_if_redis_is_master_2) ge 2 } - server R2 argocd-redis-ha-announce-2:6379 check inter 1s fall 1 rise 1 + server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1 haproxy_init.sh: | HAPROXY_CONF=/data/haproxy.cfg cp /readonly/haproxy.cfg "$HAPROXY_CONF" diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index 5c8641464a009..e3b1afc1c9855 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -2145,9 +2145,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE0 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # Check Sentinel and whether they are nominated master backend check_if_redis_is_master_1 mode tcp @@ -2159,9 +2159,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE1 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # Check Sentinel and whether they are nominated master backend check_if_redis_is_master_2 mode tcp @@ -2173,9 +2173,9 @@ data: tcp-check expect string REPLACE_ANNOUNCE2 tcp-check send QUIT\r\n tcp-check expect string +OK - server R0 argocd-redis-ha-announce-0:26379 check inter 1s - server R1 argocd-redis-ha-announce-1:26379 check inter 1s - server R2 argocd-redis-ha-announce-2:26379 check inter 1s + server R0 argocd-redis-ha-announce-0:26379 check inter 3s + server R1 argocd-redis-ha-announce-1:26379 check inter 3s + server R2 argocd-redis-ha-announce-2:26379 check inter 3s # decide redis backend to use #master @@ -2194,11 +2194,11 @@ data: tcp-check send QUIT\r\n tcp-check expect string +OK use-server R0 if { srv_is_up(R0) } { nbsrv(check_if_redis_is_master_0) ge 2 } - server R0 argocd-redis-ha-announce-0:6379 check inter 1s fall 1 rise 1 + server R0 argocd-redis-ha-announce-0:6379 check inter 3s fall 1 rise 1 use-server R1 if { srv_is_up(R1) } { nbsrv(check_if_redis_is_master_1) ge 2 } - server R1 argocd-redis-ha-announce-1:6379 check inter 1s fall 1 rise 1 + server R1 argocd-redis-ha-announce-1:6379 check inter 3s fall 1 rise 1 use-server R2 if { srv_is_up(R2) } { nbsrv(check_if_redis_is_master_2) ge 2 } - server R2 argocd-redis-ha-announce-2:6379 check inter 1s fall 1 rise 1 + server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1 haproxy_init.sh: | HAPROXY_CONF=/data/haproxy.cfg cp /readonly/haproxy.cfg "$HAPROXY_CONF"