Merge branch 'GONRG-6458-redis-in-tf-refi' into 'master'

Added redis ssl configuration, updated readme

See merge request !338

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:

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 }}

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"