From 7f0605c606f92e4012a1005a798e884b342ae277 Mon Sep 17 00:00:00 2001
From: pandas886 <123344357+pandas886@users.noreply.github.com>
Date: Thu, 28 Dec 2023 13:10:00 +0800
Subject: [PATCH] =?UTF-8?q?hive=E5=92=8Cyarn=E5=AE=B9=E5=99=A8=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8FHADOOP=5FCONF=5FDI?=
 =?UTF-8?q?R=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AE=B9=E5=99=A8=E5=86=85?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8hadoop=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8Bfs=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl       | 2 ++
 cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl         | 2 ++
 .../EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl       | 2 ++
 .../EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl         | 2 ++
 .../EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl     | 2 ++
 .../EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl      | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl
index 9d203935..5ef912eb 100644
--- a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl
@@ -45,6 +45,8 @@ spec:
         env:
           - name: "SERVICE_NAME"
             value: "metastore"
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: "HIVE_CONF_DIR"
             value: "/opt/edp/${service.serviceName}/conf"
           - name: MEM_LIMIT
diff --git a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl
index cc606861..11f871a7 100644
--- a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl
@@ -45,6 +45,8 @@ spec:
         env:
           - name: "SERVICE_NAME"
             value: "server2"
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: "HIVE_CONF_DIR"
             value: "/opt/edp/${service.serviceName}/conf"
           - name: MEM_LIMIT
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl
index 3ebed987..8aca5f19 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl
@@ -65,6 +65,8 @@ spec:
             memory: "${conf['hadop.yarn.hs.container.limit.memory']}Mi"
             cpu: "${conf['hadop.yarn.hs.container.limit.cpu']}"
         env:
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: MEM_LIMIT
             valueFrom:
               resourceFieldRef:
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl
index ec56cd3e..3b32b015 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl
@@ -69,6 +69,8 @@ spec:
             valueFrom:
               resourceFieldRef:
                 resource: limits.memory
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: yarnHeapRam
             value: "${conf['yarn.nodemanager.heap.memory']}"
         securityContext:
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl
index ecaf621f..2eaeb05e 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl
@@ -65,6 +65,8 @@ spec:
             memory: "${conf['hadop.yarn.rm.container.limit.memory']}Mi"
             cpu: "${conf['hadop.yarn.rm.container.limit.cpu']}"
         env:
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: MEM_LIMIT
             valueFrom:
               resourceFieldRef:
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl
index 8bc7b3b7..527a9dfc 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl
@@ -61,6 +61,8 @@ spec:
             memory: "${conf['hadop.yarn.tl.container.limit.memory']}Mi"
             cpu: "${conf['hadop.yarn.tl.container.limit.cpu']}"
         env:
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: MEM_LIMIT
             valueFrom:
               resourceFieldRef: