feat(ckan): Allow to override all container images

StatCan · Oct 29, 2024 · 1cfe43a · 1cfe43a
1 parent fd95fc6
commit 1cfe43a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/stable/ckan/Chart.lock b/stable/ckan/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 10.2.0
 - name: solr
   repository: https://statcan.github.io/charts
-  version: 1.5.9
+  version: 1.5.10
 - name: datapusher
   repository: https://statcan.github.io/charts
   version: 1.0.0
-digest: sha256:d569101cc3c6e87e7835523de864f20b61b3a277f3532882b5329874f55bcfec
-generated: "2024-10-29T10:13:51.342967104-04:00"
+digest: sha256:8e8bd24b9018ec981cef8147b7f01354a98b481e5be4110362c43fb7ec40d6f2
+generated: "2024-10-29T10:38:13.919340399-04:00"
diff --git a/stable/ckan/Chart.yaml b/stable/ckan/Chart.yaml
@@ -1,7 +1,7 @@
 name: ckan
 apiVersion: v2
 type: application
-version: 0.0.27
+version: 0.0.28
 appVersion: 2.9.5
 description: CKAN Helm Chart for Kubernetes.
 keywords:
@@ -28,7 +28,7 @@ dependencies:
     repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
     condition: postgresql.enabled
   - name: solr
-    version: 1.5.9
+    version: 1.5.10
     repository: https://statcan.github.io/charts
     condition: solr.enabled
   - name: datapusher

diff --git a/stable/ckan/charts/solr-1.5.10.tgz b/stable/ckan/charts/solr-1.5.10.tgz
diff --git a/stable/ckan/charts/solr-1.5.9.tgz b/stable/ckan/charts/solr-1.5.9.tgz
diff --git a/stable/ckan/templates/deploy/ckan.yaml b/stable/ckan/templates/deploy/ckan.yaml
@@ -66,7 +66,7 @@ spec:
       {{ end }}
       initContainers:
       - name: create-production-ini
-        image: busybox
+        image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
         command:
         - "sh"
         - "-c"
@@ -82,7 +82,7 @@ spec:
           readOnly: false
       {{- if .Values.ckan.persistence.enabled }}
       - name: set-volume-ownership
-        image: busybox
+        image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
         command:
         - "sh"
         - "-c"
@@ -97,7 +97,7 @@ spec:
       containers:
       {{ if .Values.pgbouncer.enabled }}
         - name: pgbouncer
-          image: mcr.microsoft.com/azure-oss-db-tools/pgbouncer-sidecar:latest
+          image: "{{ .Values.pgbouncer.image.repository }}:{{ .Values.pgbouncer.image.tag }}"
           imagePullPolicy: Always
           ports:
             - containerPort: 5432
@@ -135,7 +135,7 @@ spec:
             value: "{{ .Values.solr.initialize.maxShardsPerNode }}"
           - name: CKAN_SOLR_INIT_CONFIGSETNAME
             value: "{{ .Values.solr.initialize.configsetName }}"
-  
+
           command:
           - /bin/bash
           - -c

diff --git a/stable/ckan/values.yaml b/stable/ckan/values.yaml
@@ -9,6 +9,11 @@ image:
   tag: 2.9
   pullPolicy: IfNotPresent
 
+initContainer:
+  image:
+    repository: busybox
+    tag: latest
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: "ckan-scheming"
@@ -169,10 +174,17 @@ solr:
   image:
     repository: solr
     tag: 8.11.1
+  initContainer:
+    image:
+      repository: busybox
+      tag: latest
   zookeeper:
     replicaCount: 1
     persistence:
       size: 1Gi
+    image:
+      repository: zookeeper
+      tag: 3.5.5
 
 ## Configuration values for the Redis dependency sub-chart
 ## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis/README.md
@@ -245,7 +257,9 @@ pgbouncer:
   password: password
   poolSize: 50
   maxClientConnections: 400
-
+  image:
+    repository: mcr.microsoft.com/azure-oss-db-tools/pgbouncer-sidecar
+    tag: latest
 # Specify an external database
 # Useful for managed offerings from your Cloud Provider
 external: