Skip to content

feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings #1218

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

Merged
openshift-merge-bot merged 13 commits into from
Jul 30, 2026
Merged

feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1d3149c
feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings
akhilnittala Jul 15, 2026
3835fe3
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 17, 2026
dd3344f
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 21, 2026
fb202c5
feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings
akhilnittala Jul 22, 2026
fe10fd9
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 22, 2026
6b41339
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 23, 2026
9c5dfeb
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 24, 2026
6ec3349
feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings
akhilnittala Jul 24, 2026
632dffd
feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings
akhilnittala Jul 24, 2026
1ad66c2
feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings
akhilnittala Jul 27, 2026
4e3e016
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 27, 2026
8791131
feat(redis-ha-proxy): Configure Redis Ha Proxy TLS settings
akhilnittala Jul 28, 2026
0076265
Merge branch 'master' into usr/akhil/GITOPS-10289
akhilnittala Jul 30, 2026
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
45 changes: 33 additions & 12 deletions build/redis/haproxy.cfg.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
{{- if eq .UseTLS "true"}}
global
ca-base /app/config/redis/tls

{{- if .TLSMinVersion}}
ssl-default-bind-options ssl-min-ver TLSv{{.TLSMinVersion}}
ssl-default-server-options ssl-min-ver TLSv{{.TLSMinVersion}}
{{- end}}

{{- if .TLSCiphers}}
{{- if eq .TLSMinVersion "1.3"}}
# TLS 1.3 cipher suites
ssl-default-bind-ciphersuites {{.TLSCiphers}}
ssl-default-server-ciphersuites {{.TLSCiphers}}
{{- else}}
# TLS 1.2 and below cipher lists
ssl-default-bind-ciphers {{.TLSCiphers}}
ssl-default-server-ciphers {{.TLSCiphers}}

# Also configure TLS 1.3 cipher suites when TLS 1.3 is negotiated
Comment thread
akhilnittala marked this conversation as resolved.
ssl-default-bind-ciphersuites {{.TLSCiphers}}
ssl-default-server-ciphersuites {{.TLSCiphers}}
{{- end}}
{{- end}}
{{- end}}

defaults REDIS
Expand Down Expand Up @@ -37,9 +58,9 @@ backend check_if_redis_is_master_0
server R1 {{.ServiceName}}-announce-1:26379 check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 check inter 3s
{{- else}}
server R0 {{.ServiceName}}-announce-0:26379 verify required ca-file tls.crt check inter 3s
server R1 {{.ServiceName}}-announce-1:26379 verify required ca-file tls.crt check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 verify required ca-file tls.crt check inter 3s
server R0 {{.ServiceName}}-announce-0:26379 ssl verify required ca-file tls.crt check inter 3s
server R1 {{.ServiceName}}-announce-1:26379 ssl verify required ca-file tls.crt check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 ssl verify required ca-file tls.crt check inter 3s
{{- end}}
# Check Sentinel and whether they are nominated master
backend check_if_redis_is_master_1
Expand All @@ -63,9 +84,9 @@ backend check_if_redis_is_master_1
server R1 {{.ServiceName}}-announce-1:26379 check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 check inter 3s
{{- else}}
server R0 {{.ServiceName}}-announce-0:26379 verify required ca-file tls.crt check inter 3s
server R1 {{.ServiceName}}-announce-1:26379 verify required ca-file tls.crt check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 verify required ca-file tls.crt check inter 3s
server R0 {{.ServiceName}}-announce-0:26379 ssl verify required ca-file tls.crt check inter 3s
server R1 {{.ServiceName}}-announce-1:26379 ssl verify required ca-file tls.crt check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 ssl verify required ca-file tls.crt check inter 3s
{{- end}}
# Check Sentinel and whether they are nominated master
backend check_if_redis_is_master_2
Expand All @@ -89,9 +110,9 @@ backend check_if_redis_is_master_2
server R1 {{.ServiceName}}-announce-1:26379 check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 check inter 3s
{{- else}}
server R0 {{.ServiceName}}-announce-0:26379 verify required ca-file tls.crt check inter 3s
server R1 {{.ServiceName}}-announce-1:26379 verify required ca-file tls.crt check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 verify required ca-file tls.crt check inter 3s
server R0 {{.ServiceName}}-announce-0:26379 ssl verify required ca-file tls.crt check inter 3s
server R1 {{.ServiceName}}-announce-1:26379 ssl verify required ca-file tls.crt check inter 3s
server R2 {{.ServiceName}}-announce-2:26379 ssl verify required ca-file tls.crt check inter 3s
{{- end}}

# decide redis backend to use
Expand Down Expand Up @@ -125,9 +146,9 @@ backend bk_redis_master
server R2 {{.ServiceName}}-announce-2:6379 check inter 3s fall 1 rise 1
{{- else}}
use-server R0 if { srv_is_up(R0) } { nbsrv(check_if_redis_is_master_0) ge 2 }
server R0 {{.ServiceName}}-announce-0:6379 verify required ca-file tls.crt check inter 3s fall 1 rise 1
server R0 {{.ServiceName}}-announce-0:6379 ssl verify required ca-file tls.crt 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 {{.ServiceName}}-announce-1:6379 verify required ca-file tls.crt check inter 3s fall 1 rise 1
server R1 {{.ServiceName}}-announce-1:6379 ssl verify required ca-file tls.crt 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 {{.ServiceName}}-announce-2:6379 verify required ca-file tls.crt check inter 3s fall 1 rise 1
server R2 {{.ServiceName}}-announce-2:6379 ssl verify required ca-file tls.crt check inter 3s fall 1 rise 1
{{- end}}
117 changes: 59 additions & 58 deletions bundle/manifests/argoproj.io_applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,12 +411,12 @@ spec:
apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in the
kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in the
kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -800,12 +800,12 @@ spec:
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in
the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in
the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -1299,11 +1299,11 @@ spec:
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
description: NamePrefix overrides the namePrefix in the kustomization.yaml
for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
description: NameSuffix overrides the nameSuffix in the kustomization.yaml
for Kustomize apps
type: string
namespace:
Expand Down Expand Up @@ -1676,12 +1676,12 @@ spec:
apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in the
kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in the
kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -2087,12 +2087,12 @@ spec:
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in the
kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in the
kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -2646,12 +2646,12 @@ spec:
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in
the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in
the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -3039,12 +3039,12 @@ spec:
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in
the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in
the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -3191,6 +3191,7 @@ spec:
observedAt:
description: |-
ObservedAt indicates when the application state was updated without querying latest git state

Deprecated: controller no longer updates ObservedAt field
format: date-time
type: string
Expand Down Expand Up @@ -3587,12 +3588,12 @@ spec:
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
description: NamePrefix overrides the namePrefix
in the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to
resources for Kustomize apps
description: NameSuffix overrides the nameSuffix
in the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that
Expand Down Expand Up @@ -4000,12 +4001,12 @@ spec:
selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended
to resources for Kustomize apps
description: NamePrefix overrides the namePrefix
in the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended
to resources for Kustomize apps
description: NameSuffix overrides the nameSuffix
in the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that
Expand Down Expand Up @@ -4530,12 +4531,12 @@ spec:
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in
the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in
the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -4934,12 +4935,12 @@ spec:
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
description: NamePrefix overrides the namePrefix
in the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to
resources for Kustomize apps
description: NameSuffix overrides the nameSuffix
in the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -5459,12 +5460,12 @@ spec:
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
description: NamePrefix overrides the namePrefix
in the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to
resources for Kustomize apps
description: NameSuffix overrides the nameSuffix
in the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that
Expand Down Expand Up @@ -5912,12 +5913,12 @@ spec:
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
description: NamePrefix overrides the namePrefix
in the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to
resources for Kustomize apps
description: NameSuffix overrides the nameSuffix
in the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that
Expand Down Expand Up @@ -6425,12 +6426,12 @@ spec:
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
description: NamePrefix overrides the namePrefix in
the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to resources
for Kustomize apps
description: NameSuffix overrides the nameSuffix in
the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down Expand Up @@ -6829,12 +6830,12 @@ spec:
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
description: NamePrefix overrides the namePrefix
in the kustomization.yaml for Kustomize apps
type: string
nameSuffix:
description: NameSuffix is a suffix appended to
resources for Kustomize apps
description: NameSuffix overrides the nameSuffix
in the kustomization.yaml for Kustomize apps
type: string
namespace:
description: Namespace sets the namespace that Kustomize
Expand Down
Loading
Loading