Merge branch 'sc1-enable-cluster-for-cache' into 'master'

Enable cache to configure for Redis Cluster

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7079

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Hossein Pursultani <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Sylvester Chin <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb

@@ -3,7 +3,7 @@
 
 class RedisHelper
   REDIS_INSTANCES = %w[cache queues shared_state trace_chunks rate_limiting sessions repository_cache cluster_rate_limiting].freeze
-  ALLOWED_REDIS_CLUSTER_INSTANCE = %w[rate_limiting cluster_rate_limiting].freeze
+  ALLOWED_REDIS_CLUSTER_INSTANCE = %w[cache rate_limiting cluster_rate_limiting].freeze
 
   def initialize(node)
     @node = node

spec/chef/cookbooks/gitlab/recipes/gitlab-rails_spec.rb

@@ -5,7 +5,7 @@
 
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(templatesymlink runit_service)).converge('gitlab::default') }
   let(:redis_instances) { RedisHelper::REDIS_INSTANCES }
-  let(:redis_cluster_instances) { %w(cluster_rate_limiting) }
+  let(:redis_cluster_instances) { %w(cache rate_limiting cluster_rate_limiting) }
   let(:config_dir) { '/var/opt/gitlab/gitlab-rails/etc/' }
   let(:default_vars) do
     {
@@ -325,7 +325,7 @@
     end
 
     context 'with multiple redis cluster instance' do
-      %w(queues shared_state trace_chunks sessions cache).each do |instance|
+      %w(queues shared_state trace_chunks sessions).each do |instance|
         it_should_behave_like 'instances does not support redis cluster', instance
       end