[bitnami/clickhouse] Set Zookeeper 3.8.x as subchart (#19005)

* [bitnami/clickhouse] Set Zookeeper 3.8.x as subchart Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com> * [bitnami/clickhouse] Increase timeout Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com> * [bitnami/clickhouse] Update chart version Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com> * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> --------- Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
bitnami · Sep 6, 2023 · bb4f400 · bb4f400
1 parent db0f0cd
commit bb4f400
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.vib/clickhouse/ginkgo/clickhouse_suite_test.go b/.vib/clickhouse/ginkgo/clickhouse_suite_test.go
@@ -32,7 +32,7 @@ func init() {
 	flag.StringVar(&username, "username", "", "database user")
 	flag.StringVar(&password, "password", "", "database password for username")
 	flag.IntVar(&shards, "shards", 2, "number of shards")
-	flag.IntVar(&timeoutSeconds, "timeout", 120, "timeout in seconds")
+	flag.IntVar(&timeoutSeconds, "timeout", 180, "timeout in seconds")
 	timeout = time.Duration(timeoutSeconds) * time.Second
 }
 

diff --git a/bitnami/clickhouse/Chart.yaml b/bitnami/clickhouse/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: clickhouse
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/clickhouse
-version: 3.8.0
+version: 3.8.1
diff --git a/bitnami/clickhouse/README.md b/bitnami/clickhouse/README.md
@@ -342,11 +342,15 @@ The command removes all the Kubernetes components associated with the chart and
 
 ### Zookeeper subchart parameters
 
-| Name                             | Description                   | Value  |
-| -------------------------------- | ----------------------------- | ------ |
-| `zookeeper.enabled`              | Deploy Zookeeper subchart     | `true` |
-| `zookeeper.replicaCount`         | Number of Zookeeper instances | `3`    |
-| `zookeeper.service.ports.client` | Zookeeper client port         | `2181` |
+| Name                             | Description                                          | Value                 |
+| -------------------------------- | ---------------------------------------------------- | --------------------- |
+| `zookeeper.enabled`              | Deploy Zookeeper subchart                            | `true`                |
+| `zookeeper.replicaCount`         | Number of Zookeeper instances                        | `3`                   |
+| `zookeeper.service.ports.client` | Zookeeper client port                                | `2181`                |
+| `zookeeper.image.registry`       | Zookeeper image registry                             | `docker.io`           |
+| `zookeeper.image.repository`     | Zookeeper image repository                           | `bitnami/zookeeper`   |
+| `zookeeper.image.tag`            | Zookeeper image tag (immutable tags are recommended) | `3.8.2-debian-11-r40` |
+| `zookeeper.image.pullPolicy`     | Zookeeper image pull policy                          | `IfNotPresent`        |
 
 See <https://github.com/bitnami-labs/readme-generator-for-helm> to create the table.
 

diff --git a/bitnami/clickhouse/values.yaml b/bitnami/clickhouse/values.yaml
@@ -1110,7 +1110,18 @@ externalZookeeper:
 ##
 zookeeper:
   enabled: true
+  ## Override zookeeper default image as 3.9 is not supported https://github.com/ClickHouse/ClickHouse/issues/53749
+  ## ref: https://github.com/bitnami/containers/tree/main/bitnami/zookeeper
+  ## @param zookeeper.image.registry Zookeeper image registry
+  ## @param zookeeper.image.repository Zookeeper image repository
+  ## @param zookeeper.image.tag Zookeeper image tag (immutable tags are recommended)
+  ## @param zookeeper.image.pullPolicy Zookeeper image pull policy
+  image:
+    registry: docker.io
+    repository: bitnami/zookeeper
+    tag: 3.8.2-debian-11-r40
+    pullPolicy: IfNotPresent
   replicaCount: 3
   service:
     ports:
-      client: 2181
+      client: 2181