Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade redis-ha to 4.12.15, use bind value #6205

Merged
merged 1 commit into from
May 11, 2021
Merged

chore: upgrade redis-ha to 4.12.15, use bind value #6205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifests/ha/base/redis-ha/chart/requirements.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion manifests/ha/base/redis-ha/chart/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: redis-ha
version: 4.12.14
version: 4.12.15
repository: https://dandydeveloper.github.io/charts
32 changes: 16 additions & 16 deletions manifests/ha/base/redis-ha/chart/upstream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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..."
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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:
- ""
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions manifests/ha/base/redis-ha/chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ redis-ha:
image:
tag: 6.2.1-alpine
sentinel:
config:
replaceme: "0.0.0.0"
bind: "0.0.0.0"
4 changes: 1 addition & 3 deletions manifests/ha/base/redis-ha/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions manifests/ha/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions manifests/ha/namespace-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down