From b1f6b28d9dd8dbbfcd5b589864ceb6ebf143dfb3 Mon Sep 17 00:00:00 2001
From: puzhihao <pzh905655347@gmail.com>
Date: Thu, 11 Jul 2024 11:48:05 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0zookeeper=20helm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/group_vars/all.yml | 36 ++++++++++++++++++++++++++++++++++++
 etc/kubez/globals.yml      | 17 +++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index c9e6af5b..133cc318 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -240,6 +240,19 @@ enable_kuberhealthy: "no"
 kuberhealthy_namespace: "{{ kubez_namespace }}"
 kuberhealthy_version: "104"
 
+######################
+# zookeeper Options
+######################
+# https://artifacthub.io/packages/helm/bitnami/zookeeper
+enable_zookeeper: "no"
+zookeeper_namespace: "{{ kubez_namespace }}"
+zookeeper_replicas: 1
+zookeeper_requests_cpu: 2
+zookeeper_requests_memory: 4Gi
+zookeeper_storage_size: 8Gi
+zookeeper_storage_class: managed-nfs-storage
+zookeeper_version: "11.4.9"
+
 ####################
 # Chaos Mesh Options
 ####################
@@ -572,6 +585,8 @@ enable_charts:
     enabled: "{{ enable_kuberhealthy | bool }}"
   - name: loggie
     enabled: "{{ enable_loggie | bool }}"
+  - name: zookeeper
+    enabled: "{{ enable_zookeeper | bool }}"
 
 charts:
   prometheus:
@@ -905,3 +920,24 @@ charts:
       version: "{{ kuberhealthy_version }}"
     chart_extra_vars: {}
     chart_extra_flags: {}
+
+  zookeeper:
+    name: zookeeper
+    namespace: "{{ zookeeper_namespace }}"
+    repository:
+      name: zookeeper
+      url: https://charts.bitnami.com/bitnami
+      chart:
+        path: "zookeeper/zookeeper"
+        version: "{{ zookeeper_version }}"
+      chart_extra_vars:
+        replicaCount: "{{ zookeeper_replicas }}"
+        persistence.enabled: "true"
+        persistence.size: "{{ zookeeper_storage_size }}"
+        persistence.storageClass: "{{ zookeeper_storage_class }}"
+        resources.requests.memory: "{{ zookeeper_requests_memory }}"
+        resources.requests.cpu: "{{ zookeeper_requests_cpu }}"
+      chart_extra_flags:
+        - create-namespace
+
+
diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
index e0f426aa..febfe021 100644
--- a/etc/kubez/globals.yml
+++ b/etc/kubez/globals.yml
@@ -450,3 +450,20 @@ s3:
 #enable_kuberhealthy: "no"
 #kuberhealthy_namespace: pixiu-system
 #kuberhealthy_version: "100"
+
+######################
+# zookeeper Options
+######################
+# https://artifacthub.io/packages/helm/bitnami/zookeeper
+#enable_zookeeper: "no"
+#zookeeper_namespace: pixiu-system
+# 集群数量需要是单数
+#zookeeper_replica: 1
+# 请求资源
+#zookeeper_requests_cpu: 2
+#zookeeper_requests_memory: 4Gi
+# 持久化存储配置
+#zookeeper_storage_size: 8Gi
+#zookeeper_storage_class: managed-nfs-storage
+# 版本配置
+#zookeeper_version: 11.4.9

From fa32f1a61ac5d28b502c07cb21134aca55884f84 Mon Sep 17 00:00:00 2001
From: puzhihao <127116692+puzhihao@users.noreply.github.com>
Date: Thu, 11 Jul 2024 11:53:34 +0800
Subject: [PATCH 02/12] add Zookeeper Helm Chart

---
 ansible/group_vars/all.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 133cc318..bb97f8e1 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -939,5 +939,3 @@ charts:
         resources.requests.cpu: "{{ zookeeper_requests_cpu }}"
       chart_extra_flags:
         - create-namespace
-
-

From 5550c363201821d425e30a8b9389b94f5e6f0f72 Mon Sep 17 00:00:00 2001
From: puzhihao <pzh905655347@gmail.com>
Date: Wed, 17 Jul 2024 15:45:06 +0800
Subject: [PATCH 03/12] zookeeper helm

---
 README.md                  |  1 +
 ansible/group_vars/all.yml | 35 +++++++++++++++++++++--------------
 etc/kubez/globals.yml      | 16 +++++++++++-----
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 0cc33c8f..f7a80cb1 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Learn about Kubez Ansible by reading the documentation online [kubez-ansible](ht
     - [Kafka](docs/paas/kafka.md)
     - [RabbitMQ](docs/paas/rabbitmq.md)
     - [MongoDB](docs/paas/mongodb.md)
+    - [Zookeeper](docs/paas/zookeeper.md)
   - 微服务
     - [Isito](docs/apply/istio.md)
   - CICD
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index bb97f8e1..7dca97b6 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -244,6 +244,12 @@ kuberhealthy_version: "104"
 # zookeeper Options
 ######################
 # https://artifacthub.io/packages/helm/bitnami/zookeeper
+# helm 仓库配置项
+zookeeper_repo_name: "{{ default_repo_name }}"
+zookeeper_url: "{{ default_repo_url }}"
+zookeeper_path: "pixiuio/zookeeper"
+zookeeper_version: "11.4.9"
+# helm 配置
 enable_zookeeper: "no"
 zookeeper_namespace: "{{ kubez_namespace }}"
 zookeeper_replicas: 1
@@ -251,7 +257,8 @@ zookeeper_requests_cpu: 2
 zookeeper_requests_memory: 4Gi
 zookeeper_storage_size: 8Gi
 zookeeper_storage_class: managed-nfs-storage
-zookeeper_version: "11.4.9"
+
+
 
 ####################
 # Chaos Mesh Options
@@ -925,17 +932,17 @@ charts:
     name: zookeeper
     namespace: "{{ zookeeper_namespace }}"
     repository:
-      name: zookeeper
-      url: https://charts.bitnami.com/bitnami
-      chart:
-        path: "zookeeper/zookeeper"
-        version: "{{ zookeeper_version }}"
-      chart_extra_vars:
-        replicaCount: "{{ zookeeper_replicas }}"
-        persistence.enabled: "true"
-        persistence.size: "{{ zookeeper_storage_size }}"
-        persistence.storageClass: "{{ zookeeper_storage_class }}"
-        resources.requests.memory: "{{ zookeeper_requests_memory }}"
-        resources.requests.cpu: "{{ zookeeper_requests_cpu }}"
-      chart_extra_flags:
+      name: "{{ zookeeper_repo_name }}"
+      url: "{{ zookeeper_repo_url }}"
+    chart:
+      path: "{{ zookeeper_path }}"
+      version: "{{ zookeeper_version }}"
+    chart_extra_vars:
+      replicaCount: "{{ zookeeper_replicas }}"
+      persistence.enabled: "true"
+      persistence.size: "{{ zookeeper_storage_size }}"
+      persistence.storageClass: "{{ zookeeper_storage_class }}"
+      resources.requests.memory: "{{ zookeeper_requests_memory }}"
+      resources.requests.cpu: "{{ zookeeper_requests_cpu }}"
+    chart_extra_flags:
         - create-namespace
diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
index febfe021..448a8cf4 100644
--- a/etc/kubez/globals.yml
+++ b/etc/kubez/globals.yml
@@ -456,14 +456,20 @@ s3:
 ######################
 # https://artifacthub.io/packages/helm/bitnami/zookeeper
 #enable_zookeeper: "no"
+# repo设置 默认从pixiu仓库拉取
+#zookeeper_repo_name: zookeeper
+#zookeeper_url: https://artifacthub.io/packages/helm/bitnami/zookeeper
+#zookeeper_path: zookeeper/zookeeper
+#zookeeper_version: 11.4.9
+
+# zookeeper 设置
 #zookeeper_namespace: pixiu-system
 # 集群数量需要是单数
-#zookeeper_replica: 1
+#zookeeper_replicas: 1
 # 请求资源
-#zookeeper_requests_cpu: 2
-#zookeeper_requests_memory: 4Gi
+#zookeeper_requests_cpu: 1
+#zookeeper_requests_memory: 1Gi
 # 持久化存储配置
 #zookeeper_storage_size: 8Gi
 #zookeeper_storage_class: managed-nfs-storage
-# 版本配置
-#zookeeper_version: 11.4.9
+

From 49aec52259962c828e58b75429171b79e6d64c09 Mon Sep 17 00:00:00 2001
From: puzhihao <pzh905655347@gmail.com>
Date: Wed, 17 Jul 2024 15:45:34 +0800
Subject: [PATCH 04/12] zookeeper helm

---
 docs/paas/zookeeper.md | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 docs/paas/zookeeper.md

diff --git a/docs/paas/zookeeper.md b/docs/paas/zookeeper.md
new file mode 100644
index 00000000..4def2ef0
--- /dev/null
+++ b/docs/paas/zookeeper.md
@@ -0,0 +1,48 @@
+# Zookeeper 安装
+
+### 依赖条件
+- 运行正常的 `kubernetes` ( v1.21+ )环境。安装手册参考 [高可用集群](../install/multinode.md) 或 [单节点集群](../install/all-in-one.md)
+- StorageClass
+
+### 开启 Zookeeper 组件
+1. 编辑 `/etc/kubez/globals.yml`
+
+2. 取消 `enable_zookeeper: "no"` 的注释，设置为 `"yes"`，并取消如下参数注释
+    ```shell
+   ######################
+   # zookeeper Options
+   ######################
+   # https://artifacthub.io/packages/helm/bitnami/zookeeper
+   enable_zookeeper: "yes"
+   zookeeper_namespace: pixiu-system
+   # 集群数量需要是单数
+   zookeeper_replica: 1
+   # 请求资源
+   zookeeper_requests_cpu: 2
+   zookeeper_requests_memory: 4Gi
+   # 持久化存储配置
+   zookeeper_storage_size: 8Gi
+   zookeeper_storage_class: managed-nfs-storage
+   # 版本配置
+   zookeeper_version: 11.4.9 
+    ```
+3. 执行安装命令（根据实际情况选择）
+    ```shell
+    # 单节点集群场景
+    kubez-ansible apply
+
+    # 高可用集群场景
+    kubez-ansible -i multinode apply
+    ```
+4. 部署完验证
+    ```shell
+    root@VM-48-16-ubuntu:~# kubectl get pod -n pixiu-system zookeeper-0
+   NAME          READY   STATUS    RESTARTS   AGE
+   zookeeper-0   1/1     Running   0          58s
+
+注意 如pod启动失败Error：
+   ```
+      #存储目录授权(因为由于 Bitnami zookeeper 容器是非根容器，因此 id 为 1001 的用户需要在您挂载的本地文件夹中拥有写权限)
+      chown -R 1001:1001 {实际目录}
+   ```
+至此 `zookeeper` 已安装至集群中。
\ No newline at end of file

From 80935ce5782aefddc8425727c2bf2e4020fa8706 Mon Sep 17 00:00:00 2001
From: puzhihao <127116692+puzhihao@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:49:52 +0800
Subject: [PATCH 05/12] Update all.yml


From 13695da9a42911b546a1b1fc1a99e839976c272e Mon Sep 17 00:00:00 2001
From: puzhihao <127116692+puzhihao@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:50:34 +0800
Subject: [PATCH 06/12] Update all.yml

---
 ansible/group_vars/all.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index e8c4f7c9..e5972449 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -258,8 +258,6 @@ zookeeper_requests_memory: 4Gi
 zookeeper_storage_size: 8Gi
 zookeeper_storage_class: managed-nfs-storage
 
-
-
 ####################
 # Chaos Mesh Options
 ####################

From a1eb32265c455b2b14756835f48cc8cee9f68dc9 Mon Sep 17 00:00:00 2001
From: puzhihao <127116692+puzhihao@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:52:19 +0800
Subject: [PATCH 07/12] Update all.yml

---
 ansible/group_vars/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index e5972449..95e4e1c4 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -949,4 +949,4 @@ charts:
       resources.requests.memory: "{{ zookeeper_requests_memory }}"
       resources.requests.cpu: "{{ zookeeper_requests_cpu }}"
     chart_extra_flags:
-        - create-namespace
+      - create-namespace

From 6c6c035b475aceff337bba1b4f2b8c5e2854ddd8 Mon Sep 17 00:00:00 2001
From: puzhihao <127116692+puzhihao@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:52:44 +0800
Subject: [PATCH 08/12] Update globals.yml

---
 etc/kubez/globals.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
index 4edcb2d3..24ddb2be 100644
--- a/etc/kubez/globals.yml
+++ b/etc/kubez/globals.yml
@@ -478,4 +478,3 @@ s3:
 # 持久化存储配置
 #zookeeper_storage_size: 8Gi
 #zookeeper_storage_class: managed-nfs-storage
-

From 57223de4613cc3cd577927c52a1c429141a5e090 Mon Sep 17 00:00:00 2001
From: puzhihao <127116692+puzhihao@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:57:59 +0800
Subject: [PATCH 09/12] Update zookeeper.md

---
 docs/paas/zookeeper.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/paas/zookeeper.md b/docs/paas/zookeeper.md
index 4def2ef0..2cc0baf1 100644
--- a/docs/paas/zookeeper.md
+++ b/docs/paas/zookeeper.md
@@ -24,7 +24,7 @@
    zookeeper_storage_size: 8Gi
    zookeeper_storage_class: managed-nfs-storage
    # 版本配置
-   zookeeper_version: 11.4.9 
+   zookeeper_version: 11.4.9
     ```
 3. 执行安装命令（根据实际情况选择）
     ```shell
@@ -45,4 +45,4 @@
       #存储目录授权(因为由于 Bitnami zookeeper 容器是非根容器，因此 id 为 1001 的用户需要在您挂载的本地文件夹中拥有写权限)
       chown -R 1001:1001 {实际目录}
    ```
-至此 `zookeeper` 已安装至集群中。
\ No newline at end of file
+至此 `zookeeper` 已安装至集群中。

From 52a3f8db0281dc1bc18707d5a9f023053c563b1b Mon Sep 17 00:00:00 2001
From: puzhihao <pzh905655347@gmail.com>
Date: Fri, 19 Jul 2024 17:00:01 +0800
Subject: [PATCH 10/12] zookeeper helm

---
 ansible/group_vars/all.yml | 49 ++++++++++++++++++++++----------------
 docs/paas/zookeeper.md     | 48 +++++++++++++++++++++----------------
 etc/kubez/globals.yml      | 32 ++++++++++++-------------
 3 files changed, 72 insertions(+), 57 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 95e4e1c4..ac801cda 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -241,22 +241,28 @@ kuberhealthy_namespace: "{{ kubez_namespace }}"
 kuberhealthy_version: "104"
 
 ######################
-# zookeeper Options
+# zookeeper
 ######################
-# https://artifacthub.io/packages/helm/bitnami/zookeeper
-# helm 仓库配置项
-zookeeper_repo_name: "{{ default_repo_name }}"
-zookeeper_url: "{{ default_repo_url }}"
-zookeeper_path: "pixiuio/zookeeper"
-zookeeper_version: "11.4.9"
-# helm 配置
 enable_zookeeper: "no"
-zookeeper_namespace: "{{ kubez_namespace }}"
+# helm 配置
+zookeeper_repository_name: "{{ default_repo_name }}"
+zookeeper_repository_url: "{{ default_repo_url }}"
+zookeeper_repository_path: "{{ default_repo_name }}/zookeeper"
+# zookeeper配置
 zookeeper_replicas: 1
-zookeeper_requests_cpu: 2
-zookeeper_requests_memory: 4Gi
-zookeeper_storage_size: 8Gi
-zookeeper_storage_class: managed-nfs-storage
+zookeeper_requests_cpu: 1
+zookeeper_requests_memory: "1Gi"
+zookeeper_namespace: "{{ kubez_namespace }}"
+zookeeper_image_registry: "{{ app_image_repository }}"
+zookeeper_image_repository: "zookeeper"
+zookeeper_version: "11.4.9"
+# zookeeper持久化设置
+zookeeper_persistence_enabled: "false"
+zookeeper_persistence_size: "8Gi"
+zookeeper_persistence_storageclass: "{{ nfs_storage_class }}"
+zookeeper_context_fsgroup: "0"
+
+
 
 ####################
 # Chaos Mesh Options
@@ -936,17 +942,20 @@ charts:
     name: zookeeper
     namespace: "{{ zookeeper_namespace }}"
     repository:
-      name: "{{ zookeeper_repo_name }}"
-      url: "{{ zookeeper_repo_url }}"
+      name: "{{ zookeeper_repository_name }}"
+      url: "{{ zookeeper_repository_url }}"
     chart:
-      path: "{{ zookeeper_path }}"
+      path: "{{ zookeeper_repository_path }}"
       version: "{{ zookeeper_version }}"
     chart_extra_vars:
+      image.registry: "{{ zookeeper_image_registry }}"
+      image.repository: "{{ zookeeper_image_repository }}"
       replicaCount: "{{ zookeeper_replicas }}"
-      persistence.enabled: "true"
-      persistence.size: "{{ zookeeper_storage_size }}"
-      persistence.storageClass: "{{ zookeeper_storage_class }}"
-      resources.requests.memory: "{{ zookeeper_requests_memory }}"
+      persistence.enabled: "{{ zookeeper_persistence_enabled }}"
+      persistence.size: "{{ zookeeper_persistence_size }}"
+      persistence.storageClass: "{{ zookeeper_persistence_storageclass }}"
       resources.requests.cpu: "{{ zookeeper_requests_cpu }}"
+      resources.requests.memory: "{{ zookeeper_requests_memory }}"
+      podSecurityContext.fsGroup: "{{ zookeeper_context_fsgroup }}"
     chart_extra_flags:
       - create-namespace
diff --git a/docs/paas/zookeeper.md b/docs/paas/zookeeper.md
index 2cc0baf1..c8dc27f1 100644
--- a/docs/paas/zookeeper.md
+++ b/docs/paas/zookeeper.md
@@ -10,21 +10,26 @@
 2. 取消 `enable_zookeeper: "no"` 的注释，设置为 `"yes"`，并取消如下参数注释
     ```shell
    ######################
-   # zookeeper Options
+   # zookeeper
    ######################
-   # https://artifacthub.io/packages/helm/bitnami/zookeeper
    enable_zookeeper: "yes"
-   zookeeper_namespace: pixiu-system
-   # 集群数量需要是单数
-   zookeeper_replica: 1
-   # 请求资源
-   zookeeper_requests_cpu: 2
-   zookeeper_requests_memory: 4Gi
-   # 持久化存储配置
-   zookeeper_storage_size: 8Gi
-   zookeeper_storage_class: managed-nfs-storage
-   # 版本配置
-   zookeeper_version: 11.4.9
+   # helm 配置
+   #zookeeper_repository_name: "{{ default_repo_name }}"
+   #zookeeper_repository_url: "{{ default_repo_url }}"
+   #zookeeper_repository_path: "{{ default_repo_name }}/zookeeper"
+   # zookeeper配置
+   zookeeper_replicas: 3
+   #zookeeper_requests_cpu: 1
+   #zookeeper_requests_memory: "1Gi"
+   #zookeeper_namespace: "{{ kubez_namespace }}"
+   #zookeeper_image_registry: "{{ app_image_repository }}"
+   #zookeeper_image_repository: "zookeeper"
+   #zookeeper_version: "11.4.9"
+   # zookeeper持久化设置
+   zookeeper_persistence_enabled: "true"
+   #zookeeper_persistence_size: "8Gi"
+   #zookeeper_persistence_storageclass: "{{ nfs_storage_class }}"
+   #zookeeper_context_fsgroup: "0"
     ```
 3. 执行安装命令（根据实际情况选择）
     ```shell
@@ -36,13 +41,14 @@
     ```
 4. 部署完验证
     ```shell
-    root@VM-48-16-ubuntu:~# kubectl get pod -n pixiu-system zookeeper-0
-   NAME          READY   STATUS    RESTARTS   AGE
-   zookeeper-0   1/1     Running   0          58s
-
-注意 如pod启动失败Error：
-   ```
-      #存储目录授权(因为由于 Bitnami zookeeper 容器是非根容器，因此 id 为 1001 的用户需要在您挂载的本地文件夹中拥有写权限)
-      chown -R 1001:1001 {实际目录}
+   root@VM-0-16-ubuntu:/home/ubuntu# kubectl get pod -n pixiu-system
+   zookeeper-0                                 1/1     Running            0          16s
+   zookeeper-1                                 1/1     Running            0          16s
+   zookeeper-2                                 1/1     Running            0          16s
+   root@VM-0-16-ubuntu:/home/ubuntu# kubectl get pvc -n pixiu-system
+   NAME               STATUS   VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS          AGE
+   data-zookeeper-0   Bound    pvc-9723f14b-e87c-4276-ba6a-55497068757e   8Gi        RWO            managed-nfs-storage   3m23s
+   data-zookeeper-1   Bound    pvc-5c73b82c-0312-4c67-8929-037d8fc1b0bb   8Gi        RWO            managed-nfs-storage   19s
+   data-zookeeper-2   Bound    pvc-1b6e23f0-0f90-496a-a7ec-433796b5d06d   8Gi        RWO            managed-nfs-storage   19s
    ```
 至此 `zookeeper` 已安装至集群中。
diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
index 24ddb2be..f4c42802 100644
--- a/etc/kubez/globals.yml
+++ b/etc/kubez/globals.yml
@@ -458,23 +458,23 @@ s3:
 #kuberhealthy_version: "100"
 
 ######################
-# zookeeper Options
+# zookeeper
 ######################
-# https://artifacthub.io/packages/helm/bitnami/zookeeper
 #enable_zookeeper: "no"
-# repo设置 默认从pixiu仓库拉取
-#zookeeper_repo_name: zookeeper
-#zookeeper_url: https://artifacthub.io/packages/helm/bitnami/zookeeper
-#zookeeper_path: zookeeper/zookeeper
-#zookeeper_version: 11.4.9
-
-# zookeeper 设置
-#zookeeper_namespace: pixiu-system
-# 集群数量需要是单数
+# helm 配置
+#zookeeper_repository_name: "{{ default_repo_name }}"
+#zookeeper_repository_url: "{{ default_repo_url }}"
+#zookeeper_repository_path: "{{ default_repo_name }}/zookeeper"
+# zookeeper配置
 #zookeeper_replicas: 1
-# 请求资源
 #zookeeper_requests_cpu: 1
-#zookeeper_requests_memory: 1Gi
-# 持久化存储配置
-#zookeeper_storage_size: 8Gi
-#zookeeper_storage_class: managed-nfs-storage
+#zookeeper_requests_memory: "1Gi"
+#zookeeper_namespace: "{{ kubez_namespace }}"
+#zookeeper_image_registry: "{{ app_image_repository }}"
+#zookeeper_image_repository: "zookeeper"
+#zookeeper_version: "11.4.9"
+# zookeeper持久化设置
+#zookeeper_persistence_enabled: "false"
+#zookeeper_persistence_size: "8Gi"
+#zookeeper_persistence_storageclass: "{{ nfs_storage_class }}"
+#zookeeper_context_fsgroup: "0"
\ No newline at end of file

From 84a44694e1e44a9797ff1b8a7766675c24f7226c Mon Sep 17 00:00:00 2001
From: puzhihao <pzh905655347@gmail.com>
Date: Fri, 19 Jul 2024 17:00:30 +0800
Subject: [PATCH 11/12] zookeeper helm

---
 ansible/group_vars/all.yml | 4 +---
 docs/paas/zookeeper.md     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index ac801cda..0ed7b357 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -262,8 +262,6 @@ zookeeper_persistence_size: "8Gi"
 zookeeper_persistence_storageclass: "{{ nfs_storage_class }}"
 zookeeper_context_fsgroup: "0"
 
-
-
 ####################
 # Chaos Mesh Options
 ####################
@@ -958,4 +956,4 @@ charts:
       resources.requests.memory: "{{ zookeeper_requests_memory }}"
       podSecurityContext.fsGroup: "{{ zookeeper_context_fsgroup }}"
     chart_extra_flags:
-      - create-namespace
+      - create-namespace
\ No newline at end of file
diff --git a/docs/paas/zookeeper.md b/docs/paas/zookeeper.md
index c8dc27f1..eb5dc667 100644
--- a/docs/paas/zookeeper.md
+++ b/docs/paas/zookeeper.md
@@ -51,4 +51,4 @@
    data-zookeeper-1   Bound    pvc-5c73b82c-0312-4c67-8929-037d8fc1b0bb   8Gi        RWO            managed-nfs-storage   19s
    data-zookeeper-2   Bound    pvc-1b6e23f0-0f90-496a-a7ec-433796b5d06d   8Gi        RWO            managed-nfs-storage   19s
    ```
-至此 `zookeeper` 已安装至集群中。
+至此 `zookeeper` 已安装至集群中。
\ No newline at end of file

From 009efadbbba09be04d4a363889a7f0c0d3585d5b Mon Sep 17 00:00:00 2001
From: puzhihao <pzh905655347@gmail.com>
Date: Fri, 19 Jul 2024 17:04:13 +0800
Subject: [PATCH 12/12] zookeeper helm

---
 ansible/group_vars/all.yml | 2 +-
 etc/kubez/globals.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 0ed7b357..15a1f110 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -956,4 +956,4 @@ charts:
       resources.requests.memory: "{{ zookeeper_requests_memory }}"
       podSecurityContext.fsGroup: "{{ zookeeper_context_fsgroup }}"
     chart_extra_flags:
-      - create-namespace
\ No newline at end of file
+      - create-namespace
diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
index f4c42802..84f2e2bf 100644
--- a/etc/kubez/globals.yml
+++ b/etc/kubez/globals.yml
@@ -477,4 +477,4 @@ s3:
 #zookeeper_persistence_enabled: "false"
 #zookeeper_persistence_size: "8Gi"
 #zookeeper_persistence_storageclass: "{{ nfs_storage_class }}"
-#zookeeper_context_fsgroup: "0"
\ No newline at end of file
+#zookeeper_context_fsgroup: "0"