use vars to define CLUSTER_NAME

apecloud · Mar 3, 2025 · 3bd950a · 3bd950a
1 parent d62edde
commit 3bd950a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/addons/clickhouse/configs/00_default_overrides.xml.tpl b/addons/clickhouse/configs/00_default_overrides.xml.tpl
@@ -16,7 +16,7 @@
   <macros>
     <shard from_env="CURRENT_SHARD_COMPONENT_SHORT_NAME"/>
     <replica from_env="CURRENT_POD_NAME"/>
-    <layer>{{ $.cluster.metadata.name }}</layer>
+    <layer from_env="CLUSTER_NAME"/>
   </macros>
   <!-- Log Level -->
   <logger>

diff --git a/addons/clickhouse/templates/cmpd-clickhouse.yaml b/addons/clickhouse/templates/cmpd-clickhouse.yaml
@@ -122,6 +122,10 @@ spec:
           shortName: Required
     - name: CLICKHOUSE_ADMIN_USER
       value: admin
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
     - name: CLICKHOUSE_ADMIN_PASSWORD
       valueFrom:
         credentialVarRef: