support custome etcd args (#2337)

Signed-off-by: pixiake <[email protected]> (cherry picked from commit 1dd1e54) Signed-off-by: pixiake <[email protected]> (cherry picked from commit 3aa568d)
kubesphere · Aug 1, 2024 · 5cc39d7 · 5cc39d7
1 parent d68566c
commit 5cc39d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/cmd/kk/apis/kubekey/v1alpha2/etcd_types.go b/cmd/kk/apis/kubekey/v1alpha2/etcd_types.go
@@ -29,6 +29,7 @@ type EtcdCluster struct {
 	External                ExternalEtcd `yaml:"external" json:"external,omitempty"`
 	Port                    *int         `yaml:"port" json:"port,omitempty"`
 	PeerPort                *int         `yaml:"peerPort" json:"peerPort,omitempty"`
+	ExtraArgs               []string     `yaml:"extraArgs" json:"extraArgs,omitempty"`
 	BackupDir               string       `yaml:"backupDir" json:"backupDir,omitempty"`
 	BackupPeriod            int          `yaml:"backupPeriod" json:"backupPeriod,omitempty"`
 	KeepBackupNumber        int          `yaml:"keepBackupNumber" json:"keepBackupNumber,omitempty"`

diff --git a/cmd/kk/pkg/etcd/tasks.go b/cmd/kk/pkg/etcd/tasks.go
@@ -311,6 +311,7 @@ func refreshConfig(KubeConf *common.KubeConf, runtime connector.Runtime, endpoin
 			"Hostname":            host.GetName(),
 			"Port":                KubeConf.Cluster.Etcd.GetPort(),
 			"PeerPort":            KubeConf.Cluster.Etcd.GetPeerPort(),
+			"ExtraArgs":           KubeConf.Cluster.Etcd.ExtraArgs,
 			"State":               state,
 			"PeerAddresses":       strings.Join(endpoints, ","),
 			"UnsupportedArch":     UnsupportedArch,

diff --git a/cmd/kk/pkg/etcd/templates/etcd_env.go b/cmd/kk/pkg/etcd/templates/etcd_env.go
@@ -82,6 +82,11 @@ ETCD_LOG_LEVEL={{ .LogLevel }}
 {{- if .UnsupportedArch }}
 ETCD_UNSUPPORTED_ARCH={{ .Arch }}
 {{ end }}
+{{- if .ExtraArgs }}
+{{- range $index, $value := .ExtraArgs }}
+{{ $value }}
+{{- end }}
+{{- end }}
 
 # TLS settings
 ETCD_TRUSTED_CA_FILE=/etc/ssl/etcd/ssl/ca.pem