Skip to content

make redis config includes DRY

Summary

As per !2234 (comment 709100277) our present redis config templates are not DRY - there's a few places with copy-pasted lines.

Steps to reproduce

look at the code for charts/gitlab/charts/{geo-logcursor,migrations,sidekiq,task-runner,webservice}/templates/configmap.yaml and notice repeating code block:

  {{- include "gitlab.rails.redis.resque" . | nindent 2 }}
  {{- include "gitlab.rails.redis.cache" . | nindent 2 }}
  {{- include "gitlab.rails.redis.sharedState" . | nindent 2 }}
  {{- include "gitlab.rails.redis.queues" . | nindent 2 }}
  {{- include "gitlab.rails.redis.cable" . | nindent 2 }}
  {{- include "gitlab.rails.redis.traceChunks" . | nindent 2 }}
  {{- include "gitlab.rails.redis.rateLimiting" . | nindent 2 }}

Configuration used

any...

Current behavior

repeated code block

Expected behavior

call to the same template, something like

{{ include "gitlab.rails.redis.all" . | nindent 2 }}

instead

Versions

  • Chart: (tagged version | branch | hash git rev-parse HEAD)
  • Platform:
    • Cloud: (GKE | AKS | EKS | ?)
    • Self-hosted: (OpenShift | Minikube | Rancher RKE | ?)
  • Kubernetes: (kubectl version)
    • Client:
    • Server:
  • Helm: (helm version)
    • Client:
    • Server:

Relevant logs

(Please provide any relevant log snippets you have collected, using code blocks (```) to format)