From a6e2e2852c3c44cbfe38324140d38a33fe9ba1f6 Mon Sep 17 00:00:00 2001
From: "Siarhei Symanovich (EPAM)" <siarhei_symanovich@epam.com>
Date: Wed, 8 Feb 2023 08:57:21 +0000
Subject: [PATCH] Added redis ssl configuration, updated readme
---
devops/gc/deploy/README.md | 4 ++--
devops/gc/deploy/templates/configmap.yaml | 1 +
devops/gc/deploy/values.yaml | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index db8a9e5c3..d003ed853 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -36,7 +36,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
**entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
**registerHost** | register service host address | string | `http://register` | yes
**partitionHost** | partition service host address | string | `http://partition` | yes
-**redisNotificationHost** | The host for redis instance. If empty, helm installs an internal redis instance | string | `redis-ent-master` | yes
+**redisNotificationHost** | The host for redis instance. If empty, helm installs an internal redis instance | string | `redis-notification` | yes
**redisNotificationPort** | The port for redis instance | digit | 6379 | yes
### Deployment variables
@@ -62,7 +62,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
**notificationRedisSecretName** | Notification redis secret | string | `notification-redis-secret` | yes
**onPremEnabled** | whether on-prem is enabled | boolean | false | yes
**domain** | your domain, ex `example.com` | string | - | yes
-
+**redisSSL** | Redis host ssl config. External redis configuration only if true | string | false | no
### Install the helm chart
Run this command from within this directory:
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index 4028d5ede..67c3981f3 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -12,6 +12,7 @@ data:
REGISTER_HOST: {{ .Values.data.registerHost | quote}}
PARTITION_HOST: {{ .Values.data.partitionHost | quote}}
REDIS_PORT: {{ .Values.data.redisNotificationPort | quote }}
+ REDIS_WITH_SSL: {{ .Values.conf.redisSSL | quote }}
{{- if .Values.data.redisNotificationHost }}
REDIS_HOST: {{ .Values.data.redisNotificationHost | quote }}
{{- else }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index dd6930090..7a870efb6 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -26,8 +26,7 @@ conf:
notificationRedisSecretName: "notification-redis-secret"
onPremEnabled: false
domain: ""
-#FIXME fix condition with redis ssl configuration
-# redisSSL: false
+ redisSSL: false
istio:
proxyCPU: "50m"
--
GitLab