inject more env var when start-computer.sh (#115)

apache · Oct 14, 2021 · 614d8a0 · 614d8a0
1 parent 5f06b65
commit 614d8a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@
 target
 gen-java
 build
+**/dependency-reduced-pom.xml
diff --git a/computer-dist/src/assembly/static/bin/start-computer.sh b/computer-dist/src/assembly/static/bin/start-computer.sh
@@ -175,7 +175,7 @@ if [ ! -a "${COPY_CONF_DIR}" ]; then
 fi
 
 NEW_COMPUTER_CONF_PATH="${COPY_CONF_DIR}/$(basename "${COMPUTER_CONF_PATH}")"
-envsubst '${POD_IP}' < "${COMPUTER_CONF_PATH}" > "${NEW_COMPUTER_CONF_PATH}"
+envsubst '${POD_IP},${HOSTNAME},${POD_NAME},${POD_NAMESPACE}' < "${COMPUTER_CONF_PATH}" > "${NEW_COMPUTER_CONF_PATH}"
 chmod 777 "${NEW_COMPUTER_CONF_PATH}"
 
 if [ "${LOG4J_CONF_PATH}" != "" ];then

diff --git a/computer-k8s/src/main/java/com/baidu/hugegraph/computer/k8s/util/KubeUtil.java b/computer-k8s/src/main/java/com/baidu/hugegraph/computer/k8s/util/KubeUtil.java
@@ -99,7 +99,7 @@ public static boolean waitUntilReady(Duration initialDelay,
     }
 
     public static String crName(String jobId) {
-        return jobId.toLowerCase();
+        return jobId.toLowerCase().replaceAll("_", "-");
     }
 
     public static String genJobId(String algorithmName) {