Toolbox customScripts bug

Summary

Location: /charts/gitlab/charts/toolbox/templates/deployment.yaml Line: 273

Under the volumes block, "gitlab.nodeSelector" is being included resulting in invalid yaml.

Steps to reproduce

Creating custom ruby scripts for gitlab toolbox

Configuration used

(Please provide a sanitized version of the configuration used wrapped in a code block (```yaml))

{{- end }}\
- name: toolbox-secrets\
emptyDir:\
medium: "Memory"\
{{- include "gitlab.certificates.volumes" . | nindent 6 }}\
{{- include "gitlab.nodeSelector" . | nindent 6 }}\
{{- if .Values.customScripts }}\
- name: {{ template "fullname" . }}-custom-scripts\
projected:\
sources:\
- configMap:\
name: {{ template "fullname" . }}-custom-scripts\
{{- end }}

Current behavior

NodeSelector is being defined in container volume. This is preventing the use of custom ruby scripts for gitlab toolbox if nodeSelector is defined.

Expected behavior

NodeSelector should not be defined in container volume

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)

Edited by Sarafa Lawal