upddate kube yaml files

Author: leeeunkoo

Makefile

@@ -63,6 +63,8 @@ install:
 	-mkdir -p /etc/containers/systemd/piccolo/etcd-data/
 	-cp -r ./src/settings.yaml /etc/containers/systemd/piccolo/
 	-cp -r ./containers/piccolo-*.* /etc/containers/systemd/piccolo/
+	-cp -r ./scripts/update_server_ip.sh /etc/containers/systemd/piccolo/
+	
 	systemctl daemon-reload
 	systemctl start piccolo-server
 	systemctl start piccolo-player

containers/piccolo-server.kube

@@ -8,9 +8,8 @@ WantedBy=multi-user.target default.target
 
 [Kube]
 Yaml=/etc/containers/systemd/piccolo/piccolo-server.yaml
-# settings.yaml에서 호스트 IP를 추출하여 환경 변수로 설정
-PodmanArgs=--env HOST_IP=$(grep -A 3 "host:" /etc/containers/systemd/piccolo/settings.yaml | grep "ip:" | awk '{print $2}')
 
 [Service]
 Restart=always
-ExecStartPre=/bin/bash -c 'if ! ip=$(grep -A 3 "host:" /etc/containers/systemd/piccolo/settings.yaml | grep "ip:" | awk "{print \\$2}"); then echo "Failed to extract host IP from settings.yaml"; exit 1; fi'
+# settings.yaml에서 IP를 읽어서 yaml 파일을 동적으로 수정하는 스크립트 실행
+ExecStartPre=/etc/containers/systemd/piccolo/update_server_ip.sh

containers/piccolo-server.yaml

@@ -14,20 +14,11 @@ spec:
   containers:
   - name: etcd
     image: gcr.io/etcd-development/etcd:v3.5.11
-    command: ["/bin/sh"]
+    command: ["/usr/local/bin/etcd"]
     args: 
-    - "-c"
-    - |
-      # HOST_IP 환경변수가 있으면 사용, 없으면 기본값 사용
-      if [ -z "$HOST_IP" ]; then
-        echo "Warning: HOST_IP environment variable not set. Using 127.0.0.1 as default."
-        HOST_IP="127.0.0.1"
-      else
-        echo "Using host IP from environment variable: $HOST_IP"
-      fi
-      
-      # etcd 실행
-      exec /usr/local/bin/etcd --data-dir=/etcd-data --listen-client-urls=http://${HOST_IP}:2379,http://127.0.0.1:2379 --advertise-client-urls=http://${HOST_IP}:2379
+    - "--data-dir=/etcd-data"
+    - "--listen-client-urls=http://127.0.0.1:2379,http://$(HOST_IP):2379"
+    - "--advertise-client-urls=http://$(HOST_IP):2379"
     volumeMounts:
     - name: etcd-data
       mountPath: /etcd-data

scripts/update_server_ip.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# settings.yaml 파일에서 IP를 추출하여 YAML 파일의 $(HOST_IP) 패턴을 대체하는 스크립트
+
+# 입력 및 출력 파일 경로
+SETTINGS_YAML="/etc/containers/systemd/piccolo/settings.yaml"
+SERVER_YAML="/etc/containers/systemd/piccolo/piccolo-server.yaml"
+
+# settings.yaml에서 IP 주소 추출
+HOST_IP=$(grep -A 3 "host:" $SETTINGS_YAML | grep "ip:" | sed -e "s/^[ ]*ip:[ ]*//" -e "s/[ ]*$//")
+echo "Extracted HOST_IP: $HOST_IP"
+
+# IP 주소가 비어있는지 확인
+if [ -z "$HOST_IP" ]; then
+  echo "Failed to extract host IP from settings.yaml"
+  exit 1
+fi
+
+# 문자 그대로의 $(HOST_IP)를 실제 IP 주소로 대체
+sed -i "s/\\\$(HOST_IP)/${HOST_IP}/g" $SERVER_YAML
+
+echo "Successfully replaced \$(HOST_IP) with $HOST_IP in $SERVER_YAML"
+exit 0