ClickHouse secrets aren't included in the toolbox backup job

Summary

ClickHouse secrets configuration is not properly included in the toolbox backup job template, which causes an error when the backup job is started and it tries to access ClickHouse.

This was discovered by a GitLab Ultimate customer.

Steps to reproduce

With ClickHouse enabled:

  1. Trigger a backup job either manually or via the scheduled cron
  2. Observe the job logs
  3. Note the failure related to missing ClickHouse connection parameters

Configuration used

Unsure. If it's relevant, I can grab it from them. My understanding is that this occurs with any config using ClickHouse.

Current behavior

The toolbox-backup container start up encounters an error due to the missing ClickHouse secrets.

Expected behavior

The backup job should run as expected.

Versions

  • Chart: 8.10.4
  • Platform:
    • Cloud: AWS EKS k8s cluster
  • Kubernetes: (kubectl version)
    • Server: v1.31.6-eks-bc803b4
  • Helm: (helm version)
    • They use ArgoCD v2.13.5+03600ae to deploy which uses Helm v3.15.4+gfa9efb0

Relevant logs

When the toolbox-backup instance is started:

Defaulted container "toolbox-backup" out of: toolbox-backup, certificates (init), configure (init)
Begin parsing .erb templates from /var/opt/gitlab/templates
Writing /srv/gitlab/config/cable.yml
Writing /srv/gitlab/config/click_house.yml
/var/opt/gitlab/templates/click_house.yml.erb:6:in `read': No such file or directory @ rb_sysopen - /etc/gitlab/clickhouse/.main_password (Errno::ENOENT)
from /var/opt/gitlab/templates/click_house.yml.erb:6:in `<main>'
from /usr/lib/ruby/3.2.0/erb.rb:429:in `eval'
from /usr/lib/ruby/3.2.0/erb.rb:429:in `result'
from /usr/lib/ruby/3.2.0/erb.rb:414:in `run'
from /usr/lib/ruby/gems/3.2.0/gems/erb-4.0.2/libexec/erb:144:in `run'
from /usr/lib/ruby/gems/3.2.0/gems/erb-4.0.2/libexec/erb:164:in `<top (required)>'