feat: add nodeEtcHosts property

shihaoH · Jun 18, 2024 · c3c241d · c3c241d
1 parent 6257e71
commit c3c241d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/cmd/kk/apis/kubekey/v1alpha2/dns_types.go b/cmd/kk/apis/kubekey/v1alpha2/dns_types.go
@@ -18,6 +18,7 @@ package v1alpha2
 
 type DNS struct {
 	DNSEtcHosts  string       `yaml:"dnsEtcHosts" json:"dnsEtcHosts"`
+	NodeEtcHosts string       `yaml:"nodeEtcHosts" json:"nodeEtcHosts,omitempty"`
 	CoreDNS      CoreDNS      `yaml:"coredns" json:"coredns"`
 	NodeLocalDNS NodeLocalDNS `yaml:"nodelocaldns" json:"nodelocaldns"`
 }

diff --git a/cmd/kk/pkg/bootstrap/os/templates/init_script.go b/cmd/kk/pkg/bootstrap/os/templates/init_script.go
@@ -18,6 +18,7 @@ package templates
 
 import (
 	"fmt"
+	"strings"
 	"text/template"
 
 	"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/bootstrap/registry"
@@ -272,6 +273,17 @@ func GenerateHosts(runtime connector.ModuleRuntime, kubeConf *common.KubeConf) [
 
 	}
 
+	nodeEtcHosts := kubeConf.Cluster.DNS.NodeEtcHosts
+	if len(nodeEtcHosts) > 0 {
+		lines := strings.Split(strings.TrimSpace(nodeEtcHosts), "\n")
+		for i := range lines {
+			line := strings.TrimSpace(lines[i])
+			if line != "" {
+				hostsList = append(hostsList, line)
+			}
+		}
+	}
+
 	hostsList = append(hostsList, lbHost)
 	return hostsList
 }