From da6f1d66d3fd384a2cc349f906bd0b3da1bbd735 Mon Sep 17 00:00:00 2001
From: Ashish <ashishchoudhary789456@gmail.com>
Date: Fri, 13 Feb 2026 20:55:38 +0530
Subject: [PATCH] feat: support keeper image pull secrets and extra manifests

---
 charts/clickhouse/Chart.yaml                     |  2 +-
 charts/clickhouse/README.md                      |  2 ++
 charts/clickhouse/templates/chk.yaml             |  4 ++++
 charts/clickhouse/templates/extra-manifests.yaml |  4 ++++
 charts/clickhouse/values.schema.json             | 14 ++++++++++++++
 charts/clickhouse/values.yaml                    | 11 +++++++++++
 6 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 charts/clickhouse/templates/extra-manifests.yaml

diff --git a/charts/clickhouse/Chart.yaml b/charts/clickhouse/Chart.yaml
index 4090f06f..2de8e0da 100644
--- a/charts/clickhouse/Chart.yaml
+++ b/charts/clickhouse/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clickhouse
 description: A Helm chart for creating a ClickHouse® Cluster with the Altinity Operator for ClickHouse
 type: application
-version: 0.3.8
+version: 0.3.9
 appVersion: "25.3.6.10034"
 
 dependencies:
diff --git a/charts/clickhouse/README.md b/charts/clickhouse/README.md
index 9a8ce7ca..7817eb54 100644
--- a/charts/clickhouse/README.md
+++ b/charts/clickhouse/README.md
@@ -255,8 +255,10 @@ EOSQL
 | clickhouse.shardsCount | int | `1` | number of shards. |
 | clickhouse.users | list | `[]` | Configure additional ClickHouse users. |
 | clickhouse.zones | list | `[]` |  |
+| extraManifests | list | `[]` | Extra manifests to deploy as an array |
 | keeper.enabled | bool | `false` | Whether to enable Keeper. Required for replicated tables. |
 | keeper.image | string | `"altinity/clickhouse-keeper"` |  |
+| keeper.imagePullSecrets | list | `[]` | Image pull secrets for Keeper pods |
 | keeper.localStorage.size | string | `"5Gi"` |  |
 | keeper.localStorage.storageClass | string | `""` |  |
 | keeper.metricsPort | string | `""` |  |
diff --git a/charts/clickhouse/templates/chk.yaml b/charts/clickhouse/templates/chk.yaml
index 7153c018..02dcace5 100644
--- a/charts/clickhouse/templates/chk.yaml
+++ b/charts/clickhouse/templates/chk.yaml
@@ -113,6 +113,10 @@ spec:
           tolerations:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with $.Values.keeper.imagePullSecrets }}
+          imagePullSecrets:
+            {{- toYaml $.Values.keeper.imagePullSecrets | nindent 12 }}
+          {{- end }}
           containers:
             - name: clickhouse-keeper
               image: "{{ $.Values.keeper.image }}:{{ $.Values.keeper.tag }}"
diff --git a/charts/clickhouse/templates/extra-manifests.yaml b/charts/clickhouse/templates/extra-manifests.yaml
new file mode 100644
index 00000000..2b21b710
--- /dev/null
+++ b/charts/clickhouse/templates/extra-manifests.yaml
@@ -0,0 +1,4 @@
+{{ range .Values.extraManifests }}
+---
+{{ tpl . $ }}
+{{ end }}
diff --git a/charts/clickhouse/values.schema.json b/charts/clickhouse/values.schema.json
index 4b554050..d98ba581 100644
--- a/charts/clickhouse/values.schema.json
+++ b/charts/clickhouse/values.schema.json
@@ -14,6 +14,13 @@
       "type": "string",
       "description": "Custom cluster domain of Kubernetes cluster."
     },
+    "extraManifests": {
+      "type": "array",
+      "description": "Extra manifests to deploy as an array.",
+      "items": {
+        "type": "string"
+      }
+    },
     "clickhouse": {
       "type": "object",
       "properties": {
@@ -358,6 +365,13 @@
           "type": "object",
           "description": "Node selector for Keeper pods."
         },
+        "imagePullSecrets": {
+          "type": "array",
+          "description": "Image pull secrets for Keeper pods.",
+          "items": {
+            "type": "object"
+          }
+        },
         "tolerations": {
           "type": "array",
           "description": "Tolerations for Keeper pods.",
diff --git a/charts/clickhouse/values.yaml b/charts/clickhouse/values.yaml
index 737e61bc..40606b75 100644
--- a/charts/clickhouse/values.yaml
+++ b/charts/clickhouse/values.yaml
@@ -211,6 +211,7 @@ keeper:
     size: 5Gi
     storageClass: ""
   nodeSelector: {}
+  imagePullSecrets: []
   tolerations: []
   podAnnotations: {}
   volumeClaimAnnotations: {}
@@ -224,6 +225,16 @@ keeper:
     cpuLimitsMs: 500
     memoryLimitsMiB: 1Gi
 
+# Extra manifests to deploy as an array
+extraManifests: []
+  # - |
+  #   apiVersion: v1
+  #   kind: ConfigMap
+  #   metadata:
+  #    name: {{.Release.Name }}-config
+  #   data:
+  #     extra-data: "value"
+
 operator:
   # -- Whether to enable the Altinity Operator for ClickHouse.
   # Disable if you already have the Operator installed cluster-wide.