Merge pull request #325 from rebrowning/fix_redis_password_issue

fix for the redis password not being set in the connection string

Author: cognifloyd

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Add support for providing custom st2actionrunner-specific docker repository, image name, pull policy, and pull secret via `values.yaml`. (#141) (by @Sheshagiri)
 * Fix bug that hung an init container when `st2.packs.volumes.enabled` without `st2.packs.volumes.configs`. (#324) (by @rebrowning)
 * Add ability to create custom labels for service account.(#327)(by @SuganJoe)
+* Fix bug that would not set the appropriate redis connection string when using `redis.password` and `redis.usePassword` (#325) (by @rebrowning)
 
 ## v0.100.0
 * Switch st2 to `v3.7` as a new default stable version (#274)

templates/_helpers.tpl

@@ -114,6 +114,13 @@ Generate list of nodes for Redis with Sentinel connection string, based on numbe
 {{- end -}}
 {{- end -}}
 
+{{- define "stackstorm-ha.redis-password" -}}
+{{- if not .Values.redis.sentinel.enabled }}
+{{- fail "value for redis.sentinel.enabled MUST be true" }}
+{{- end }}
+{{- if not (empty .Values.redis.password)}}:{{ .Values.redis.password }}@{{- end }}
+{{- end -}}
+
 {{/*
 Reduce duplication of the st2.*.conf volume details
 */}}

templates/configmaps_st2-conf.yaml

@@ -18,7 +18,7 @@ data:
     ssh_key_file = {{ tpl .Values.st2.system_user.ssh_key_file . }}
     {{- if index .Values "redis" "enabled" }}
     [coordination]
-    url = redis://{{ template "stackstorm-ha.redis-nodes" $ }}
+    url = redis://{{ template "stackstorm-ha.redis-password" $ }}{{ template "stackstorm-ha.redis-nodes" $ }}
     {{- end }}
     {{- if index .Values "rabbitmq" "enabled" }}
     [messaging]

values.yaml

@@ -1055,10 +1055,15 @@ redis:
   # https://github.com/bitnami/charts/tree/master/bitnami/redis#master-slave-with-sentinel
   sentinel:
     enabled: true
+    # DO NOT SET sentinel.usePassword, the tooz driver cannot connect to a password protected sentinel
+    # however it can connect to a password protected redis that is being managed by sentinel
+    # usePassword: false
     # Enable or disable static sentinel IDs for each replicas
     # If disabled each sentinel will generate a random id at startup
     # If enabled, each replicas will have a constant ID on each start-up
     staticID: true
+  # if redis.usePassword is true, you can set the password here
+  # password: mysupersecretpassword
   networkPolicy:
     enabled: false
   usePassword: false