extraenv configuration is not applied to the task-runner backup CronJob

Summary

As part of a separate ticket for a backup issue I was encountering, I was directed to setup extra environment variables to bypass PGBouncer during database backups.

In an attempt to deploy this configuration, I realized that the extraEnv configurations do not get applied to the backup-job template for the task runner cron job.

without extraEnv being applied to backup-job.yaml, we are not able to set the CronJob to bypass PGBouncer during backups without manually modifying the yaml after the fact.

Steps to reproduce

Add extraEnv configurations to the helm chart, they will not be applied to the backup CronJob (If enabled).

Configuration used

  extraEnv:
    http_proxy: "http://redacted:8080"
    https_proxy: "http://redacted:8080"
    no_proxy: "redacted"
    GITLAB_BACKUP_PGHOST: "my_pg_host.redacted.com"
    GITLAB_BACKUP_PGPORT: "5432"

Current behavior

extraEnv variables are not being applied to the backup-job.yaml CronJob template

Expected behavior

extraEnv variables should be getting applied to the backup-job.yaml CronJob template

(Example is from chart version 4.6.3)

Under the env section of backup-job.yaml I expect

`{{- include "gitlab.extraEnv" . | nindent 16 }}`

to be present

Versions

• Chart: 4.6.3
• Platform:
  • Self-hosted: Rancher RKE
• Kubernetes:
  • Client: 1.15.6
  • Server: 1.15.6
• Helm:
  • Client: 3.2.0
  • Server: N/A

Relevant logs

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