thanos: template busybox image (#614)

Author: richardtief

thanos/charts/Chart.yaml

@@ -11,7 +11,7 @@ maintainers:
 name: thanos
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 0.1.4
+version: 0.1.5
 # thanos-release
 appVersion: v0.35.0
 keywords:

thanos/charts/templates/compactor.yaml

@@ -70,7 +70,12 @@ spec:
           name: data-volume
       initContainers:
         - name: init-permissions
-          image: busybox
+          {{- $registry := .Values.global.imageRegistry | default .Values.thanos.initChownData.image.registry -}}
+          {{- if .Values.thanos.initChownData.image.sha }}
+          image: "{{ $registry }}/{{ .Values.thanos.initChownData.image.repository }}:{{ .Values.thanos.initChownData.image.tag }}@sha256:{{ .Values.thanos.initChownData.image.sha }}"
+          {{- else }}
+          image: "{{ $registry }}/{{ .Values.thanos.initChownData.image.repository }}:{{ .Values.thanos.initChownData.image.tag }}"
+          {{- end }}
           command: ['sh', '-c', 'chown 1000:3000 /data && chmod 750 /data']
           volumeMounts:
           - mountPath: /data

thanos/charts/templates/store.yaml

@@ -87,7 +87,12 @@ spec:
           name: data
       initContainers:
       - name: init-permissions
-        image: busybox
+        {{- $registry := .Values.global.imageRegistry | default .Values.thanos.initChownData.image.registry -}}
+        {{- if .Values.thanos.initChownData.image.sha }}
+        image: "{{ $registry }}/{{ .Values.thanos.initChownData.image.repository }}:{{ .Values.thanos.initChownData.image.tag }}@sha256:{{ .Values.thanos.initChownData.image.sha }}"
+        {{- else }}
+        image: "{{ $registry }}/{{ .Values.thanos.initChownData.image.repository }}:{{ .Values.thanos.initChownData.image.tag }}"
+        {{- end }}
         command: ['sh', '-c', 'chown 1000:3000 /data && chmod 750 /data']
         securityContext:
           runAsUser: 0

thanos/charts/values.yaml

@@ -5,6 +5,9 @@ global:
   ## Labels to apply to all resources
   commonLabels: {}
 
+  # -- Overrides the registry globally for all images
+  imageRegistry: null
+
 thanos:
   image:
     repository: quay.io/thanos/thanos
@@ -16,6 +19,18 @@ thanos:
   # used across the stack
   httpAddress:
 
+  ## Init container to set permissions
+  initChownData:
+
+    ## initChownData container image
+    ##
+    image:
+      # -- The Docker registry
+      registry: docker.io
+      repository: library/busybox
+      tag: "stable"
+      sha: ""
+
   query:
     replicas:
     # defaults to info

thanos/plugindefinition.yaml

@@ -10,7 +10,7 @@ spec:
     helmChart:
         name: thanos
         repository: "oci://ghcr.io/cloudoperators/greenhouse-extensions/charts"
-        version: 0.1.4
+        version: 0.1.5
     options:
         - default: null
           description: CLI param for Thanos Query
@@ -97,4 +97,4 @@ spec:
           description: TLS key for communication with Alertmanager
           required: false
           type: secret
-    version: 0.2.4
+    version: 0.2.5