From d343066b158a015dd1dd21f248a627bceb72e9e1 Mon Sep 17 00:00:00 2001
From: Ubuntu <phyer@sina.com>
Date: Mon, 24 Mar 2025 21:33:39 +0800
Subject: [PATCH] up

---
 efk_cluster/elasticsearch-ingress.yaml | 2 +-
 efk_cluster/elasticsearch-service.yaml | 6 +++---
 efk_cluster/kibana-deployment.yaml     | 2 +-
 efk_cluster/refreshTokenForKibana.sh   | 4 +---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/efk_cluster/elasticsearch-ingress.yaml b/efk_cluster/elasticsearch-ingress.yaml
index a38e1fd..898092b 100644
--- a/efk_cluster/elasticsearch-ingress.yaml
+++ b/efk_cluster/elasticsearch-ingress.yaml
@@ -11,7 +11,7 @@ spec:
       paths:
       - backend:
           service:
-            name: elasticsearch  # 指向新的 Service
+            name: elasticsearch-public  # 指向新的 Service
             port:
               number: 9200
         path: /
diff --git a/efk_cluster/elasticsearch-service.yaml b/efk_cluster/elasticsearch-service.yaml
index 7375131..e12ccee 100644
--- a/efk_cluster/elasticsearch-service.yaml
+++ b/efk_cluster/elasticsearch-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: elasticsearch
+  name: elasticsearch-public  # 新服务名，避免与现有 headless 服务冲突
   namespace: efk
 spec:
   ports:
@@ -9,5 +9,5 @@ spec:
     targetPort: 9200
     name: http
   selector:
-    statefulset.kubernetes.io/pod-name: elasticsearch-0  # 只选择 elasticsearch-0
-  type: LoadBalancer  # 保留 LoadBalancer 类型
+    statefulset.kubernetes.io/pod-name: elasticsearch-0-0  # 精确匹配 master 节点
+  type: LoadBalancer
diff --git a/efk_cluster/kibana-deployment.yaml b/efk_cluster/kibana-deployment.yaml
index 01eac2a..37e3729 100644
--- a/efk_cluster/kibana-deployment.yaml
+++ b/efk_cluster/kibana-deployment.yaml
@@ -30,4 +30,4 @@ spec:
             - name: XPACK_REPORTING_ENCRYPTIONKEY
               value: "yet_another_secure_random_string_of_32_characters"
             - name: ELASTICSEARCH_SERVICEACCOUNTTOKEN
-              value: "AAEAAWVsYXN0aWMva2liYW5hL215LXRva2VuOnlWd28tb2JZVDBxS05KaVNHQ21mSUE"
+              value: "AAEAAWVsYXN0aWMva2liYW5hL215LXRva2VuOnVtMWVLY1hTU2l5YVB0bVZvcVJFR2c"
diff --git a/efk_cluster/refreshTokenForKibana.sh b/efk_cluster/refreshTokenForKibana.sh
index 31c0af4..6f5f964 100755
--- a/efk_cluster/refreshTokenForKibana.sh
+++ b/efk_cluster/refreshTokenForKibana.sh
@@ -10,12 +10,10 @@ TOKEN=$(microk8s.kubectl exec -n efk $ES_POD -- bin/elasticsearch-service-tokens
 
 echo "new TOKEN:" ${TOKEN}
 
-
 microk8s.kubectl delete deployment kibana -n efk
 # 更新 Kibana Deployment YAML 文件
 cd $(pwd)
 # 将 token 设置为环境变量
-sed "s/##TOKEN##/$TOKEN/" kibana-deployment.yaml_tmp > kibana-deployment.yaml
+sed "s/##TOKEN##/$TOKEN/" kibana-deployment.yaml_tmp >kibana-deployment.yaml
 # 删除并重新应用 Kibana Deployment
 microk8s.kubectl apply -f kibana-deployment.yaml
-