From ac2491d37dcfece786c69b0501af0a9be42f128d Mon Sep 17 00:00:00 2001 From: aniekgul Date: Tue, 11 May 2021 03:57:40 -0400 Subject: [PATCH] chore: upgrade redis-ha to 4.12.15, use bind value (#6205) Signed-off-by: Aniek Gul --- .../ha/base/redis-ha/chart/requirements.lock | 6 ++-- .../ha/base/redis-ha/chart/requirements.yaml | 2 +- .../ha/base/redis-ha/chart/upstream.yaml | 32 +++++++++---------- manifests/ha/base/redis-ha/chart/values.yaml | 3 +- manifests/ha/base/redis-ha/generate.sh | 4 +-- manifests/ha/install.yaml | 8 ++--- manifests/ha/namespace-install.yaml | 8 ++--- 7 files changed, 30 insertions(+), 33 deletions(-) diff --git a/manifests/ha/base/redis-ha/chart/requirements.lock b/manifests/ha/base/redis-ha/chart/requirements.lock index ef7800378f3c3..6a6e810900db2 100644 --- 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://dandydeveloper.github.io/charts - version: 4.12.14 -digest: sha256:fc0ed1b72121f10a6c50cccc605f73582474d03e1453a9c1e5636b84a0ee829d -generated: "2021-04-12T11:46:20.2865728-04:00" + version: 4.12.15 +digest: sha256:f65165ea10f739a6fea6830bac807bdfa247827138fb86e79d63fd3db92c6da4 +generated: "2021-05-10T11:49:19.7720603-04:00" diff --git a/manifests/ha/base/redis-ha/chart/requirements.yaml b/manifests/ha/base/redis-ha/chart/requirements.yaml index 49531a9eda0d5..275313a459a04 100644 --- 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: 4.12.14 + version: 4.12.15 repository: https://dandydeveloper.github.io/charts diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml index f295f3c292c99..86425dd338711 100644 --- a/manifests/ha/base/redis-ha/chart/upstream.yaml +++ b/manifests/ha/base/redis-ha/chart/upstream.yaml @@ -9,7 +9,7 @@ metadata: labels: heritage: Helm release: argocd - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 app: argocd-redis-ha --- # Source: redis-ha/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml @@ -21,7 +21,7 @@ metadata: labels: heritage: Helm release: argocd - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 app: argocd-redis-ha --- # Source: redis-ha/charts/redis-ha/templates/redis-ha-configmap.yaml @@ -33,7 +33,7 @@ metadata: labels: heritage: Helm release: argocd - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 app: argocd-redis-ha data: redis.conf: | @@ -52,11 +52,11 @@ data: sentinel.conf: | dir "/data" port 26379 + bind 0.0.0.0 sentinel down-after-milliseconds argocd 10000 sentinel failover-timeout argocd 180000 maxclients 10000 sentinel parallel-syncs argocd 5 - bind 0.0.0.0 init.sh: | echo "$(date) Start..." @@ -461,7 +461,7 @@ metadata: labels: heritage: Helm release: argocd - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 app: argocd-redis-ha data: redis_liveness.sh: | @@ -511,7 +511,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 rules: - apiGroups: - "" @@ -530,7 +530,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy rules: - apiGroups: @@ -550,7 +550,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 subjects: - kind: ServiceAccount name: argocd-redis-ha @@ -569,7 +569,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy subjects: - kind: ServiceAccount @@ -589,7 +589,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: @@ -619,7 +619,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: @@ -649,7 +649,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: @@ -679,7 +679,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 annotations: spec: type: ClusterIP @@ -707,7 +707,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy annotations: spec: @@ -731,7 +731,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 spec: strategy: type: RollingUpdate @@ -838,7 +838,7 @@ metadata: app: redis-ha heritage: "Helm" release: "argocd" - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 annotations: {} spec: diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml index 757deb124c22d..2563d3ca9fc8a 100644 --- a/manifests/ha/base/redis-ha/chart/values.yaml +++ b/manifests/ha/base/redis-ha/chart/values.yaml @@ -17,5 +17,4 @@ redis-ha: image: tag: 6.2.1-alpine sentinel: - config: - replaceme: "0.0.0.0" + bind: "0.0.0.0" diff --git a/manifests/ha/base/redis-ha/generate.sh b/manifests/ha/base/redis-ha/generate.sh index f91ccf85820d8..7e66728c41976 100755 --- a/manifests/ha/base/redis-ha/generate.sh +++ b/manifests/ha/base/redis-ha/generate.sh @@ -9,6 +9,4 @@ helm template argocd ./chart \ --namespace argocd \ --values ./chart/values.yaml \ --no-hooks \ - >> ./chart/upstream_orig.yaml - -sed -E 's/^([[:space:]]){8}sentinel replaceme argocd/ bind/' ./chart/upstream_orig.yaml >> ./chart/upstream.yaml && rm ./chart/upstream_orig.yaml + >> ./chart/upstream.yaml diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 748d6810a2e8b..c869a29c34078 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -2591,7 +2591,7 @@ kind: Role metadata: labels: app: redis-ha - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy heritage: Helm release: argocd @@ -2751,7 +2751,7 @@ kind: RoleBinding metadata: labels: app: redis-ha - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy heritage: Helm release: argocd @@ -2856,7 +2856,7 @@ kind: ConfigMap metadata: labels: app: argocd-redis-ha - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 heritage: Helm release: argocd name: argocd-redis-ha-health-configmap @@ -3295,11 +3295,11 @@ data: sentinel.conf: | dir "/data" port 26379 + bind 0.0.0.0 sentinel down-after-milliseconds argocd 10000 sentinel failover-timeout argocd 180000 maxclients 10000 sentinel parallel-syncs argocd 5 - bind 0.0.0.0 kind: ConfigMap metadata: labels: diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index fec9be2d9cbdc..eeea83dec2572 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -123,7 +123,7 @@ kind: Role metadata: labels: app: redis-ha - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy heritage: Helm release: argocd @@ -232,7 +232,7 @@ kind: RoleBinding metadata: labels: app: redis-ha - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 component: argocd-redis-ha-haproxy heritage: Helm release: argocd @@ -303,7 +303,7 @@ kind: ConfigMap metadata: labels: app: argocd-redis-ha - chart: redis-ha-4.12.14 + chart: redis-ha-4.12.15 heritage: Helm release: argocd name: argocd-redis-ha-health-configmap @@ -742,11 +742,11 @@ data: sentinel.conf: | dir "/data" port 26379 + bind 0.0.0.0 sentinel down-after-milliseconds argocd 10000 sentinel failover-timeout argocd 180000 maxclients 10000 sentinel parallel-syncs argocd 5 - bind 0.0.0.0 kind: ConfigMap metadata: labels: