From 4a060a91fe9bc4d0b426d3568b140f086a2e9029 Mon Sep 17 00:00:00 2001
From: II <54946465+ImitationImmortal@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:41:55 +0800
Subject: [PATCH] fix: etc/hosts not correct when localhost is not belong
 cluster. (#2349)

Signed-off-by: joyceliu <joyceliu@yunify.com>
Co-authored-by: joyceliu <joyceliu@yunify.com>
---
 .../addons/cni/templates/calico/v3.27.yaml    |  2 +-
 .../roles/init/init-os/templates/init-os.sh   | 38 ++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/builtin/roles/addons/cni/templates/calico/v3.27.yaml b/builtin/roles/addons/cni/templates/calico/v3.27.yaml
index 2f66392f..9f1df95c 100644
--- a/builtin/roles/addons/cni/templates/calico/v3.27.yaml
+++ b/builtin/roles/addons/cni/templates/calico/v3.27.yaml
@@ -51,7 +51,7 @@ data:
           "log_file_path": "/var/log/calico/cni/cni.log",
           "datastore_type": "kubernetes",
           "nodename": "__KUBERNETES_NODE_NAME__",
-          "mtu": "__CNI_MTU__",
+          "mtu": __CNI_MTU__,
           "ipam": {
               "type": "calico-ipam"
           },
diff --git a/builtin/roles/init/init-os/templates/init-os.sh b/builtin/roles/init/init-os/templates/init-os.sh
index 8a3d43d1..04c15997 100644
--- a/builtin/roles/init/init-os/templates/init-os.sh
+++ b/builtin/roles/init/init-os/templates/init-os.sh
@@ -174,12 +174,40 @@ sed -i '/^$/N;/\n$/N;//D' /etc/hosts
 
 cat >>/etc/hosts<<EOF
 # kubekey hosts BEGIN
-{{- range .inventory_hosts }}
-  {{- if and .internal_ipv4 (ne .internal_ipv4 "") }}
-    {{ printf "%s %s %s.%s" .internal_ipv4 .hostname .hostname ($.kubernetes.cluster_name | default "cluster.local") }}
+# kubernetes hosts
+{{- range .groups.k8s_cluster | default list }}
+  {{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }}
+    {{ printf "%s %s %s.%s" (index $.inventory_hosts . "internal_ipv4") (index $.inventory_hosts . "hostname") (index $.inventory_hosts . "hostname") ($.kubernetes.cluster_name | default "cluster.local") }}
   {{- end }}
-  {{- if and .internal_ipv6 (ne .internal_ipv6 "") }}
-    {{ printf "%s %s %s.%s" .internal_ipv6 .internal_ipv6 .hostname ($.kubernetes.cluster_name | default "cluster.local") }}
+  {{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }}
+    {{ printf "%s %s %s.%s" (index $.inventory_hosts . "internal_ipv6") (index $.inventory_hosts . "hostname") (index $.inventory_hosts . "hostname") ($.kubernetes.cluster_name | default "cluster.local") }}
+  {{- end }}
+{{- end }}
+# etcd hosts
+{{- range .groups.etcd | default list }}
+  {{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }}
+    {{ printf "%s %s" (index $.inventory_hosts . "internal_ipv4") (index $.inventory_hosts . "hostname") }}
+  {{- end }}
+  {{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }}
+    {{ printf "%s %s" (index $.inventory_hosts . "internal_ipv6") (index $.inventory_hosts . "hostname") }}
+  {{- end }}
+{{- end }}
+# image registry hosts
+{{- range .groups.image_registry | default list }}
+  {{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }}
+    {{ printf "%s %s" (index $.inventory_hosts . "internal_ipv4") (index $.inventory_hosts . "hostname") }}
+  {{- end }}
+  {{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }}
+    {{ printf "%s %s" (index $.inventory_hosts . "internal_ipv6") (index $.inventory_hosts . "hostname") }}
+  {{- end }}
+{{- end }}
+# nfs hosts
+{{- range .groups.nfs | default list }}
+  {{- if and (index $.inventory_hosts . "internal_ipv4") (ne (index $.inventory_hosts . "internal_ipv4") "") }}
+    {{ printf "%s %s" (index $.inventory_hosts . "internal_ipv4") (index $.inventory_hosts . "hostname") }}
+  {{- end }}
+  {{- if and (index $.inventory_hosts . "internal_ipv6") (ne (index $.inventory_hosts . "internal_ipv6") "") }}
+    {{ printf "%s %s" (index $.inventory_hosts . "internal_ipv6") (index $.inventory_hosts . "hostname") }}
   {{- end }}
 {{- end }}
 # kubekey hosts END