From 7eebbbfc1c923660a7d018990a85b15195d18d6a Mon Sep 17 00:00:00 2001
From: Sylvester Chin <schin@gitlab.com>
Date: Mon, 15 May 2023 19:33:28 +0800
Subject: [PATCH] Remove cluster-ratelimiting Redis instance

Changelog: other
---
 charts/gitlab/templates/_rails.redis.tpl | 8 --------
 charts/gitlab/templates/_redis.tpl       | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/charts/gitlab/templates/_rails.redis.tpl b/charts/gitlab/templates/_rails.redis.tpl
index 019c4add93..1bb5bd7ccb 100644
--- a/charts/gitlab/templates/_rails.redis.tpl
+++ b/charts/gitlab/templates/_rails.redis.tpl
@@ -75,13 +75,6 @@ Input: dict "context" $ "name" string
 {{- end -}}
 {{- end -}}
 
-{{- define "gitlab.rails.redis.clusterRateLimiting" -}}
-{{- if .Values.global.redis.clusterRateLimiting -}}
-{{-   $_ := set $ "redisConfigName" "clusterRateLimiting" }}
-{{-   include "gitlab.rails.redis.yaml" (dict "context" $ "name" "redis.cluster_rate_limiting") -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "gitlab.rails.redis.sessions" -}}
 {{- if .Values.global.redis.sessions -}}
 {{- $_ := set $ "redisConfigName" "sessions" }}
@@ -123,7 +116,6 @@ redis.yml.erb: |
 {{ include "gitlab.rails.redis.cable" . }}
 {{ include "gitlab.rails.redis.traceChunks" . }}
 {{ include "gitlab.rails.redis.rateLimiting" . }}
-{{ include "gitlab.rails.redis.clusterRateLimiting" . }}
 {{ include "gitlab.rails.redis.sessions" . }}
 {{ include "gitlab.rails.redis.repositoryCache" . }}
 {{ include "gitlab.rails.redisYmlOverride" . }}
diff --git a/charts/gitlab/templates/_redis.tpl b/charts/gitlab/templates/_redis.tpl
index f561d72eb2..1855cf83f2 100644
--- a/charts/gitlab/templates/_redis.tpl
+++ b/charts/gitlab/templates/_redis.tpl
@@ -104,7 +104,7 @@ Note: Workhorse only uses the primary Redis (global.redis)
 {{- end -}}
 
 {{- define "gitlab.redis.secrets" -}}
-{{- range $redis := list "cache" "clusterCache" "sharedState" "queues" "actioncable" "traceChunks" "rateLimiting" "clusterRateLimiting" "sessions" "repositoryCache" -}}
+{{- range $redis := list "cache" "clusterCache" "sharedState" "queues" "actioncable" "traceChunks" "rateLimiting" "sessions" "repositoryCache" -}}
 {{-   if index $.Values.global.redis $redis -}}
 {{-     $_ := set $ "redisConfigName" $redis }}
 {{      include "gitlab.redis.secret" $ }}
-- 
GitLab