From 5b03ac616ac8473d6666a5875cbf8a3b0ffd8f84 Mon Sep 17 00:00:00 2001
From: Patrick Kelly <patrick.kelly.22@us.af.mil>
Date: Tue, 8 Mar 2022 15:56:35 +0000
Subject: [PATCH] ArgoCD - Support externally managed Redis
---
chart/templates/argocd/values.yaml | 13 ++++++++++++-
chart/values.yaml | 10 +++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/chart/templates/argocd/values.yaml b/chart/templates/argocd/values.yaml
index a204a7d332..e048483d25 100644
--- a/chart/templates/argocd/values.yaml
+++ b/chart/templates/argocd/values.yaml
@@ -33,10 +33,21 @@ dex:
imagePullSecrets:
- name: private-registry
+
+redis:
+ {{- if and .Values.addons.argocd.redis.host .Values.addons.argocd.redis.port }}
+ externalEndpoint: {{ .Values.addons.argocd.redis.host }}:{{ .Values.addons.argocd.redis.port }}
+ enabled: false
+ {{- end }}
+
redis-bb:
+ {{- if and .Values.addons.argocd.redis.host .Values.addons.argocd.redis.port }}
+ enabled: false
+ {{- else }}
+ enabled: true
+ {{- end }}
image:
pullPolicy: {{ .Values.imagePullPolicy }}
- enabled: true
auth:
enabled: false
{{- if .Values.monitoring.enabled }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 37ac295cc5..c14f176f80 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -630,7 +630,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
path: "./chart"
- tag: "3.33.5-bb.5"
+ tag: "3.33.5-bb.6"
# -- Flux reconciliation overrides specifically for the ArgoCD Package
flux: {}
@@ -639,6 +639,14 @@ addons:
ingress:
gateway: ""
+ redis:
+ # -- Hostname of a pre-existing Redis to use for ArgoCD.
+ # Entering connection info will enable external Redis and will auto-create any required secrets.
+ host: ""
+
+ # -- Port of a pre-existing Redis to use for ArgoCD.
+ port: ""
+
sso:
# -- Toggle SSO for ArgoCD on and off
enabled: false
--
GitLab