From 4cc440f2baab856f113e04d4f6869bdfec95f46f Mon Sep 17 00:00:00 2001
From: Lishen Yao <yaalsn@gmail.com>
Date: Mon, 27 Nov 2023 16:39:11 +0800
Subject: [PATCH] Remove old configuration of presto

---
 .../templates/presto/presto-coordinator-statefulset.yaml       | 3 +--
 charts/pulsar/templates/presto/presto-worker-statefulset.yaml  | 3 +--
 .../templates/presto/presto-coordinator-deployment.yaml        | 3 +--
 .../sn-platform/templates/presto/presto-worker-deployment.yaml | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/charts/pulsar/templates/presto/presto-coordinator-statefulset.yaml b/charts/pulsar/templates/presto/presto-coordinator-statefulset.yaml
index 7a50f696..e37c9725 100644
--- a/charts/pulsar/templates/presto/presto-coordinator-statefulset.yaml
+++ b/charts/pulsar/templates/presto/presto-coordinator-statefulset.yaml
@@ -135,8 +135,7 @@ spec:
             {{- end }}
             {{- else }}
             - >-
-              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
-              echo "node.internal-address=${HOSTNAME}.{{ template "presto.service" . }}.{{ template "pulsar.namespace" . }}.svc.cluster.local" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
+              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/config.properties ;
               bin/pulsar sql-worker run \
                 --etc-dir={{ template "pulsar.home" . }}/trino/conf \
                 --data-dir={{ template "pulsar.home" . }}/data;
diff --git a/charts/pulsar/templates/presto/presto-worker-statefulset.yaml b/charts/pulsar/templates/presto/presto-worker-statefulset.yaml
index c3437738..a2f7ccb0 100644
--- a/charts/pulsar/templates/presto/presto-worker-statefulset.yaml
+++ b/charts/pulsar/templates/presto/presto-worker-statefulset.yaml
@@ -140,8 +140,7 @@ spec:
             {{- end }}
             {{- else }}
             - >-
-              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
-              echo "node.internal-address=${HOSTNAME}.{{ template "presto.worker.service" . }}.{{ template "pulsar.namespace" . }}.svc.cluster.local" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
+              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/config.properties ;
               bin/pulsar sql-worker run \
                 --etc-dir={{ template "pulsar.home" . }}/trino/conf \
                 --data-dir={{ template "pulsar.home" . }}/data;
diff --git a/charts/sn-platform/templates/presto/presto-coordinator-deployment.yaml b/charts/sn-platform/templates/presto/presto-coordinator-deployment.yaml
index edf63e53..2ca6ce8e 100644
--- a/charts/sn-platform/templates/presto/presto-coordinator-deployment.yaml
+++ b/charts/sn-platform/templates/presto/presto-coordinator-deployment.yaml
@@ -118,8 +118,7 @@ spec:
           command: ["sh", "-c"]
           args:
             - >-
-              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
-              echo "node.internal-address=$(echo ${POD_IP} | tr "." "-").{{ template "presto.service" . }}.{{ template "pulsar.namespace" . }}.svc.cluster.local" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
+              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/config.properties ;
               {{- if .Values.tls.presto.enabled }}
               set -ex;
               mkdir -p /pulsar/jks;
diff --git a/charts/sn-platform/templates/presto/presto-worker-deployment.yaml b/charts/sn-platform/templates/presto/presto-worker-deployment.yaml
index 03076808..faa0dd6c 100644
--- a/charts/sn-platform/templates/presto/presto-worker-deployment.yaml
+++ b/charts/sn-platform/templates/presto/presto-worker-deployment.yaml
@@ -109,8 +109,7 @@ spec:
           command: ["sh", "-c"]
           args:
             - >-
-              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
-              echo "node.internal-address=$(echo ${POD_IP} | tr "." "-").{{ template "presto.worker.service" . }}.{{ template "pulsar.namespace" . }}.svc.cluster.local" >> {{ template "pulsar.home" . }}/trino/conf/node.properties ;
+              echo "node.id=${HOSTNAME}" >> {{ template "pulsar.home" . }}/trino/conf/config.properties ;
               {{- if .Values.tls.presto.enabled }}
               set -ex;
               mkdir -p /pulsar/jks;