diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index db8a9e5c3a2e4abd88a5e7e9f465f4d2fb693b73..d003ed853859f4635456d71864f6fe1208c5b817 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 4028d5ede5f0f2e55185ccf206df58a6af1c6837..67c3981f32ab4ec7c595dcdc5252c1417c0adbb5 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 dd6930090e63478d439a555ec113eae6fbff7e4e..7a870efb66be9fa815e0f0c988980abe55e31dd3 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"