fix: upgrade redis-ha chart and enable haproxy (#3147)

* fix: upgrade redis-ha chart and enable haproxy * fix: regenerate manifests, revert removal of failover cache client * fix: add kustomize patch to strip namespace from redis-ha manifests
argoproj · Feb 26, 2020 · 2802789 · 2802789
1 parent 0c610f9
commit 2802789
Show file tree

Hide file tree

Showing 14 changed files with 1,363 additions and 607 deletions.
diff --git a/manifests/ha/base/overlays/argocd-application-controller-deployment.yaml b/manifests/ha/base/overlays/argocd-application-controller-deployment.yaml
@@ -13,11 +13,5 @@ spec:
         - "20"
         - --operation-processors
         - "10"
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_0_SERVICE):26379
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_1_SERVICE):26379
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_2_SERVICE):26379
-        - --sentinelmaster
-        - argocd
+        - --redis
+        - "argocd-redis-ha-haproxy:6379"
diff --git a/manifests/ha/base/overlays/argocd-repo-server-deployment.yaml b/manifests/ha/base/overlays/argocd-repo-server-deployment.yaml
@@ -25,11 +25,5 @@ spec:
         command:
         - uid_entrypoint.sh
         - argocd-repo-server
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_0_SERVICE):26379
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_1_SERVICE):26379
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_2_SERVICE):26379
-        - --sentinelmaster
-        - argocd
+        - --redis
+        - "argocd-redis-ha-haproxy:6379"
diff --git a/manifests/ha/base/overlays/argocd-server-deployment.yaml b/manifests/ha/base/overlays/argocd-server-deployment.yaml
@@ -26,11 +26,5 @@ spec:
         - argocd-server
         - --staticassets
         - /shared/app
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_0_SERVICE):26379
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_1_SERVICE):26379
-        - --sentinel
-        - $(ARGOCD_REDIS_HA_ANNOUNCE_2_SERVICE):26379
-        - --sentinelmaster
-        - argocd
+        - --redis
+        - "argocd-redis-ha-haproxy:6379"
diff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: redis-ha
   repository: https://kubernetes-charts.storage.googleapis.com
-  version: 3.3.1
-digest: sha256:3e273208c389589d3d8935ddc39bf245f72c3ea0b6d3e61c4dc0862b7c3839eb
-generated: 2019-03-19T21:34:14.183861-07:00
+  version: 4.3.4
+digest: sha256:d130faa98f99a99e503bce560bcec26e1dc0a988775a6609e39a8d855ec687d5
+generated: "2020-02-20T10:42:01.98332-08:00"
diff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
 - name: redis-ha
-  version: 3.3.1
+  version: 4.3.4
   repository: https://kubernetes-charts.storage.googleapis.com