diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 1d26a666..913a07eb 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -241,6 +241,46 @@ enable_kuberhealthy: "no"
 kuberhealthy_namespace: "{{ kubez_namespace }}"
 kuberhealthy_version: "104"
 
+<<<<<<< HEAD
+=======
+######################
+# zookeeper
+######################
+enable_zookeeper: "no"
+# 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_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"
+
+##############################
+# prometheus-adapter Options
+##############################
+enable_prometheus_adapter: "yes"
+prometheus_adapter_namespace: "{{ kubez_namespace }}"
+prometheus_adapter_repository_name: "{{ default_repo_name }}"
+prometheus_adapter_repository_url: "{{ default_repo_url }}"
+prometheus_adapter_repository_path: "{{ default_repo_name }}/prometheus-adapter"
+prometheus_adapter_version: "4.11.0"
+prometheus_adapter_image_repository: "harbor.cloud.pixiuio.com/prometheus-adapter/prometheus-adapter"
+prometheus_adapter_image_tag: "v0.12.0"
+
+prometheus_url: http://kube-prometheus-stack-prometheus.pixiu-system.svc
+prometheus_port: 9090
+
+>>>>>>> f538ae1 (Add prometheus-adapter chart supported (#503))
 ####################
 # Chaos Mesh Options
 ####################
@@ -550,6 +590,13 @@ enable_charts:
     enabled: "{{ enable_cilium | bool }}"
   - name: kuberhealthy
     enabled: "{{ enable_kuberhealthy | bool }}"
+<<<<<<< HEAD
+=======
+  - name: zookeeper
+    enabled: "{{ enable_zookeeper | bool }}"
+  - name: prometheus-adapter
+    enabled: "{{ enable_prometheus_adapter | bool }}"
+>>>>>>> f538ae1 (Add prometheus-adapter chart supported (#503))
 
 charts:
   prometheus:
@@ -874,3 +921,45 @@ charts:
       version: "{{ kuberhealthy_version }}"
     chart_extra_vars: {}
     chart_extra_flags: {}
+<<<<<<< HEAD
+=======
+
+  zookeeper:
+    name: zookeeper
+    namespace: "{{ zookeeper_namespace }}"
+    repository:
+      name: "{{ zookeeper_repository_name }}"
+      url: "{{ zookeeper_repository_url }}"
+    chart:
+      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: "{{ 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
+
+  prometheus-adapter:
+    name: prometheus-adapter
+    namespace: "{{ prometheus_adapter_namespace }}"
+    repository:
+      name: "{{ prometheus_adapter_repository_name }}"
+      url: "{{ prometheus_adapter_repository_url }}"
+    chart:
+      path: "{{ prometheus_adapter_repository_path }}"
+      version: "{{ prometheus_adapter_version }}"
+    chart_extra_vars:
+      prometheus.url: "{{ prometheus_url }}"
+      prometheus.port: "{{ prometheus_port }}"
+      image.repository: "{{ prometheus_adapter_image_repository }}"
+      image.tag: "{{ prometheus_adapter_image_tag }}"
+    chart_extra_flags:
+      - create-namespace
+>>>>>>> f538ae1 (Add prometheus-adapter chart supported (#503))
diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
index c9bb9428..74a8711d 100644
--- a/etc/kubez/globals.yml
+++ b/etc/kubez/globals.yml
@@ -440,3 +440,43 @@ s3:
 #enable_kuberhealthy: "no"
 #kuberhealthy_namespace: pixiu-system
 #kuberhealthy_version: "100"
+<<<<<<< HEAD
+=======
+
+######################
+# zookeeper
+######################
+#enable_zookeeper: "no"
+# 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_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"
+
+############################
+# prometheus-adapter Options
+############################
+#enable_prometheus_adapter: "yes"
+#prometheus_adapter_namespace: pixiu-system
+#prometheus_adapter_repository_name: "{{ default_repo_name }}"
+#prometheus_adapter_repository_url: "{{ default_repo_url }}"
+#prometheus_adapter_path: "{{ default_repo_name }}/prometheus-adapter"
+#prometheus_adapter_version: "4.11.0"
+#prometheus_adapter_image_repository: "harbor.cloud.pixiuio.com/prometheus-adapter/prometheus-adapter"
+#prometheus_adapter_image_tag: "v0.12.0"
+
+#prometheus_url: http://kube-prometheus-stack-prometheus.pixiu-system.svc
+#prometheus_port: 9090
+>>>>>>> f538ae1 (Add prometheus-adapter chart supported (#503))