Adding explicit bind to redis and sentinel for IPv4 clusters #5957 (#…

…6005) * fix(redis-ha): Adding explicit bind to redis and sentinel config to support IPv4 clusters. Closes #5957 Signed-off-by: Ryan Umstead <[email protected]>
argoproj · Apr 12, 2021 · 2bbb0b1 · 2bbb0b1
1 parent 85728a6
commit 2bbb0b1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml
@@ -39,6 +39,7 @@ data:
   redis.conf: |
     dir "/data"
     port 6379
+    bind 0.0.0.0
     maxmemory 0
     maxmemory-policy volatile-lru
     min-replicas-max-lag 5
@@ -55,6 +56,7 @@ data:
         sentinel failover-timeout argocd 180000
         maxclients 10000
         sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 
   init.sh: |
     echo "$(date) Start..."
@@ -852,7 +854,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
       labels:
         release: argocd
         app: redis-ha

diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml
@@ -5,9 +5,13 @@ redis-ha:
     masterGroupName: argocd
     config:
       save: "\"\""
+      bind: "0.0.0.0"
   haproxy:
     enabled: true
     image:
       tag: 2.0.20-alpine
   image:
     tag: 6.2.1-alpine
+  sentinel:
+    config:
+      replaceme: "0.0.0.0"
diff --git a/manifests/ha/base/redis-ha/generate.sh b/manifests/ha/base/redis-ha/generate.sh
@@ -14,3 +14,4 @@ helm template argocd ./chart \
 sed -e 's/check inter 1s/check inter 3s/' ./chart/upstream_orig.yaml >> ./chart/upstream.yaml && rm ./chart/upstream_orig.yaml
 sed -i.bak 's/timeout server 30s/timeout server 6m/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
 sed -i.bak 's/timeout client 30s/timeout client 6m/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
+sed -i.bak -E 's/^([[:space:]]){8}sentinel replaceme argocd/    bind/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -2850,6 +2850,7 @@ data:
   redis.conf: |
     dir "/data"
     port 6379
+    bind 0.0.0.0
     maxmemory 0
     maxmemory-policy volatile-lru
     min-replicas-max-lag 5
@@ -2865,6 +2866,7 @@ data:
         sentinel failover-timeout argocd 180000
         maxclients 10000
         sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 kind: ConfigMap
 metadata:
   labels:
@@ -3564,7 +3566,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
       labels:
         app.kubernetes.io/name: argocd-redis-ha
     spec:

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -2765,6 +2765,7 @@ data:
   redis.conf: |
     dir "/data"
     port 6379
+    bind 0.0.0.0
     maxmemory 0
     maxmemory-policy volatile-lru
     min-replicas-max-lag 5
@@ -2780,6 +2781,7 @@ data:
         sentinel failover-timeout argocd 180000
         maxclients 10000
         sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 kind: ConfigMap
 metadata:
   labels:
@@ -3479,7 +3481,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
       labels:
         app.kubernetes.io/name: argocd-redis-ha
     spec: