read ETCD_HOST from env var

dasbd72 · Sep 24, 2023 · a02e59e · a02e59e
1 parent e8db67a
commit a02e59e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/pkg/ETCD_HOST b/pkg/ETCD_HOST
diff --git a/pkg/wrapper.py b/pkg/wrapper.py
@@ -45,22 +45,15 @@ def __init__(
 
         self.endpoint: str = endpoint
         self.force_remote: bool = force_remote
-        if os.path.exists("ETCD_HOST"):
-            with open("ETCD_HOST", "r") as f:
-                self.etcd_host = f.read()
-        else:
-            self.etcd_host = None
+        self.etcd_host = os.getenv("ETCD_HOST", "localhost:2379")
         logging.info(f"ETCD_HOST: {self.etcd_host}")
 
         try:
             self.etcd_client = etcd3.client(host=self.etcd_host, port=2379)
         except Exception as e:
             logging.error("Initialize etcd fail: {}".format(e))
 
-        if "STORAGE_PATH" in os.environ.keys():
-            self.storage_path = os.environ["STORAGE_PATH"]
-        else:
-            self.storage_path = None
+        self.storage_path = os.getenv("STORAGE_PATH", None)
         logging.info(f"STORAGE_PATH: {self.storage_path}")
 
         # Read data serve ip:port from storage

diff --git a/yamls/apps-disk.yaml b/yamls/apps-disk.yaml
@@ -34,8 +34,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
-            - name: MANAGER_PORT
-              value: "12346"
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m
@@ -85,8 +85,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
-            - name: MANAGER_PORT
-              value: "12346"
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m

diff --git a/yamls/apps.yaml b/yamls/apps.yaml
@@ -34,8 +34,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
-            - name: MANAGER_PORT
-              value: "12345"
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m
@@ -84,8 +84,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
-            - name: MANAGER_PORT
-              value: "12345"
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m

diff --git a/yamls/manager-disk.yaml b/yamls/manager-disk.yaml
@@ -42,6 +42,8 @@ spec:
           env:
             - name: STORAGE_PATH
               value: /shared
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
       volumes:
         - name: shared-volume
           hostPath:

diff --git a/yamls/manager.yaml b/yamls/manager.yaml
@@ -43,6 +43,8 @@ spec:
           env:
             - name: STORAGE_PATH
               value: /shared
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
       volumes:
         - name: shared-volume
           hostPath:

diff --git a/yamls/new-apps.yaml b/yamls/new-apps.yaml
@@ -35,6 +35,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m
@@ -85,6 +87,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m
@@ -135,6 +139,8 @@ spec:
               value: /shared
             - name: LOG_LEVEL
               value: INFO
+            - name: ETCD_HOST
+              value: "10.121.240.143:2379"
           resources:
             requests:
               cpu: 1000m