Fix calls to 'extraEnvFrom'
Summary
Context: !3508 (comment 1682648779)
-
!2536 (merged) added
extraEnvFrom
, but most of the calls to this template passed an emptydict
instead of the current context.
. - !3508 (merged) fixes this for Toolbox, but not the rest.
- The rest of the incorrect calls are listed below:
$ rg 'include "gitlab.extraEnvFrom" \(dict "root" \$ "local" \(dict\)\)'
charts/registry/templates/migrations-job.yaml:53:13: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 8 }}
charts/registry/templates/migrations-job.yaml:75:13: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 8 }}
charts/registry/templates/deployment.yaml:97:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/registry/templates/deployment.yaml:112:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/registry/templates/deployment.yaml:122:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/spamcheck/templates/deployment.yaml:77:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
templates/_certificates.tpl:15:7: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 2 }}
charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml:83:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml:111:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/geo-logcursor/templates/deployment.yaml:75:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/geo-logcursor/templates/deployment.yaml:107:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/geo-logcursor/templates/deployment.yaml:136:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/migrations/templates/_jobspec.yaml:55:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/migrations/templates/_jobspec.yaml:102:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml:67:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml:136:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/praefect/templates/statefulset.yaml:75:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/praefect/templates/statefulset.yaml:127:13: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 8 }}
charts/gitlab/charts/gitlab-shell/templates/deployment.yaml:62:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/gitlab-shell/templates/deployment.yaml:126:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/toolbox/templates/backup-job.yaml:66:21: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 16 }}
charts/gitlab/charts/toolbox/templates/backup-job.yaml:99:21: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 16 }}
charts/gitlab/charts/kas/templates/deployment.yaml:95:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/gitlab-pages/templates/deployment.yaml:88:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/gitlab-pages/templates/deployment.yaml:111:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/mailroom/templates/deployment.yaml:70:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
charts/gitlab/charts/mailroom/templates/deployment.yaml:94:15: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 10 }}
charts/gitlab/charts/sidekiq/templates/deployment.yaml:160:17: {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" (dict)) | nindent 12 }}
Work items
-
per-chart calls -
centralize specification tests -> #5458- Relocate from
spec/configuration/toolbox_spec.rb
tospec/configuration/extraenvfrom_spec.rb
, using a matrix.
- Relocate from
Acceptance criteria
-
The calls to extraEnvFrom
are corrected by passing the current context-
registry -
spamcheck -
certificates (helper) -
gitlab-exporter -
geo-logcursor -
migrations -
gitaly -
praefect -
gitlab-shell -
toolbox -
kas -
gitlab-pages -
mailroom -
sidekiq
-
Edited by Mitchell Nielsen