Merge branch 'redis-reg-mainname' into 'master'

Fix registry Redis "main name" config parameter name

See merge request !2762

charts/registry/templates/_redis.tpl

@@ -35,10 +35,10 @@ redis:
     enabled: {{ .Values.redis.cache.enabled | eq true }}
     {{- if .Values.redis.cache.sentinels }}
     addr: {{ include "registry.redis.host.sentinels" .Values.redis.cache | quote }}
-    mainName: {{ .Values.redis.cache.host }}
+    mainname: {{ .Values.redis.cache.host }}
     {{- else if .redisMergedConfig.sentinels }}
     addr: {{ include "registry.redis.host.sentinels" .redisMergedConfig | quote }}
-    mainName: {{ template "gitlab.redis.host" . }}
+    mainname: {{ template "gitlab.redis.host" . }}
     {{- else if .Values.redis.cache.host  }}
     addr: {{ printf "%s:%d" .Values.redis.cache.host (int .Values.redis.cache.port | default 6379) | quote }}
     {{- else }}

doc/charts/registry/index.md

@@ -249,7 +249,7 @@ If you chose to deploy this chart as a standalone, remove the `registry` at the
 | `redis.cache.host`                                                                                                                          | `<Redis URL>`                                                                        | The hostname of the Redis instance. If empty, the value will be filled as `global.redis.host:global.redis.port`.                                                                                      |
 | `redis.cache.port` | `6379` | The port of the Redis instance. |
 | `redis.cache.sentinels` | `[]` | List sentinels with host and port. |
-| `redis.cache.mainName`                                                                                                                          |                                                                         | The main server name. Only applicable for Sentinel.                                                                                             |
+| `redis.cache.mainname`                                                                                                                          |                                                                         | The main server name. Only applicable for Sentinel.                                                                                             |
 | `redis.cache.password.secret`                                                                                                                          | `gitlab-redis-secret`                                                                        | Name of the secret containing the Redis password.                                                                                              |
 | `redis.cache.password.key`                                                                                                                          | `redis-password`                                                                        | Secret key in which the Redis password is stored.                                                                                              |
 | `redis.cache.db`                                                                                                                          | `0`                                                                        | The name of the database to use for each connection.                                                                                              |

spec/configuration/registry_spec.rb

@@ -325,7 +325,7 @@ describe 'registry configuration' do
               cache:
                 enabled: true
                 addr: "sentinel1.example.com:26379,sentinel2.example.com:26379"
-                mainName: redis.example.com
+                mainname: redis.example.com
                 password: "REDIS_CACHE_PASSWORD"
             CONFIG
           )
@@ -359,7 +359,7 @@ describe 'registry configuration' do
               cache:
                 enabled: true
                 addr: "sentinel1.example.com:26379,sentinel2.example.com:26379"
-                mainName: redis.example.com
+                mainname: redis.example.com
                 password: "REDIS_CACHE_PASSWORD"
             CONFIG
           )
@@ -401,7 +401,7 @@ describe 'registry configuration' do
               cache:
                 enabled: true
                 addr: "local1.example.com:26379,local2.example.com:26379"
-                mainName: local.example.com
+                mainname: local.example.com
                 password: "REDIS_CACHE_PASSWORD"
             CONFIG
           )