For non-XOS charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: Icffc569e2c152e0b413f4c7b7d9a546bd9a3ef58
diff --git a/storage/rook-tools/Chart.yaml b/storage/rook-tools/Chart.yaml
index 335a61c..7d34ce3 100644
--- a/storage/rook-tools/Chart.yaml
+++ b/storage/rook-tools/Chart.yaml
@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-description: Toolbox for debuging Rook's Ceph storage
name: rook-tools
+description: Toolbox for debuging Rook's Ceph storage
version: 0.1.0-dev0
+appVersion: 'v0.8.1'
diff --git a/storage/rook-tools/templates/toolbox.yaml b/storage/rook-tools/templates/toolbox.yaml
index be5db7b..0b14243 100644
--- a/storage/rook-tools/templates/toolbox.yaml
+++ b/storage/rook-tools/templates/toolbox.yaml
@@ -22,8 +22,8 @@
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: rook-ceph-tools
- image: {{ .Values.rookCephToolsImage | quote }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: ROOK_ADMIN_SECRET
valueFrom:
diff --git a/storage/rook-tools/values.yaml b/storage/rook-tools/values.yaml
index 468e300..5fafd08 100644
--- a/storage/rook-tools/values.yaml
+++ b/storage/rook-tools/values.yaml
@@ -17,7 +17,11 @@
rookClusterNamespace: 'rook-ceph'
-rookCephToolsImage: 'rook/ceph-toolbox:v0.8.1'
+image:
+ repository: 'rook/ceph-toolbox'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'IfNotPresent'
-imagePullPolicy: 'IfNotPresent'
+global:
+ registry: ''