helm: add toolbox repository and tag settings

The operator image in the rook-ceph chart and the Ceph image in the
rook-ceph-cluster chart are both configured as a repository and tag
pair. The toolbox was the exception, taking a single toolbox.image
string.

Add toolbox.repository and toolbox.tag, so the toolbox image can be
configured the same way as the others. Either setting may be applied on
its own; whichever is left unset falls back to cephImage.repository or
cephImage.tag.

The new settings take precedence over toolbox.image, which continues to
apply when neither is set, so existing values files are unaffected.

Signed-off-by: Joshua Hoblitt <josh@hoblitt.com>

Documentation/Helm-Charts/ceph-cluster-chart.md

@@ -89,10 +89,12 @@ The following table lists the configurable parameters of the rook-operator chart
 | `toolbox.affinity` | Toolbox affinity | `{}` |
 | `toolbox.containerSecurityContext` | Toolbox container security context | `{"capabilities":{"drop":["ALL"]},"runAsGroup":2016,"runAsNonRoot":true,"runAsUser":2016}` |
 | `toolbox.enabled` | Enable Ceph debugging pod deployment. See [toolbox](../Troubleshooting/ceph-toolbox.md) | `false` |
-| `toolbox.image` | Toolbox image, defaults to the image used by the Ceph cluster | `nil` |
+| `toolbox.image` | Toolbox image, superseded by `toolbox.repository` and `toolbox.tag` | the image used by the Ceph cluster |
 | `toolbox.labels` | Toolbox labels | `{}` |
 | `toolbox.priorityClassName` | Set the priority class for the toolbox if desired | `nil` |
+| `toolbox.repository` | The repository from which to pull the toolbox image | `.Values.cephImage.repository` |
 | `toolbox.resources` | Toolbox resources | `{"limits":{"memory":"1Gi"},"requests":{"cpu":"100m","memory":"128Mi"}}` |
+| `toolbox.tag` | The tag of the toolbox image | `.Values.cephImage.tag` |
 | `toolbox.tolerations` | Toolbox tolerations | `[]` |
 
 ### **Ceph Cluster Spec**

deploy/charts/rook-ceph-cluster/templates/deployment.yaml

@@ -36,7 +36,13 @@ spec:
       {{- end }}
       containers:
         - name: rook-ceph-tools
-          image: {{ .Values.toolbox.image | default (printf "%s:%s" .Values.cephImage.repository .Values.cephImage.tag) }}
+          {{- if or .Values.toolbox.repository .Values.toolbox.tag }}
+          image: "{{ .Values.toolbox.repository | default .Values.cephImage.repository }}:{{ .Values.toolbox.tag | default .Values.cephImage.tag }}"
+          {{- else if .Values.toolbox.image }}
+          image: {{ .Values.toolbox.image | quote }}
+          {{- else }}
+          image: "{{ .Values.cephImage.repository }}:{{ .Values.cephImage.tag }}"
+          {{- end }}
           command:
             - /bin/bash
             - -c

deploy/charts/rook-ceph-cluster/values.yaml

@@ -24,7 +24,14 @@ configOverride:
 toolbox:
   # -- Enable Ceph debugging pod deployment. See [toolbox](../Troubleshooting/ceph-toolbox.md)
   enabled: false
-  # -- Toolbox image, defaults to the image used by the Ceph cluster
+  # -- The repository from which to pull the toolbox image
+  # @default -- `.Values.cephImage.repository`
+  repository: #quay.io/ceph/ceph
+  # -- The tag of the toolbox image
+  # @default -- `.Values.cephImage.tag`
+  tag: #v20.2.2
+  # -- Toolbox image, superseded by `toolbox.repository` and `toolbox.tag`
+  # @default -- the image used by the Ceph cluster
   image: #quay.io/ceph/ceph:v20.2.2
   # -- Toolbox tolerations
   tolerations: []