Merge pull request #68334 from BoCloud/master

Apply user configurations for local etcd

Merge pull request #68334 from BoCloud/master
ef62882f · k8s-ci-robot · GitHub · 25cbd1c7 · 089a6584 · ef62882f
Unverified Commit ef62882f authored Sep 10, 2018 by k8s-ci-robot Committed by GitHub Sep 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

manifests.go cmd/kubeadm/app/phases/controlplane/manifests.go +7 -0

No files found.
--- a/cmd/kubeadm/app/phases/controlplane/manifests.go
+++ b/cmd/kubeadm/app/phases/controlplane/manifests.go
@@ -184,6 +184,13 @@ func getAPIServerCommand(cfg *kubeadmapi.InitConfiguration) []string {
 		defaultArguments["etcd-cafile"] = filepath.Join(cfg.CertificatesDir, kubeadmconstants.EtcdCACertName)
 		defaultArguments["etcd-certfile"] = filepath.Join(cfg.CertificatesDir, kubeadmconstants.APIServerEtcdClientCertName)
 		defaultArguments["etcd-keyfile"] = filepath.Join(cfg.CertificatesDir, kubeadmconstants.APIServerEtcdClientKeyName)
+
+		// Apply user configurations for local etcd
+		if cfg.Etcd.Local != nil {
+			if value, ok := cfg.Etcd.Local.ExtraArgs["listen-client-urls"]; ok {
+				defaultArguments["etcd-servers"] = value
+			}
+		}
 	}

 	if features.Enabled(cfg.FeatureGates, features.HighAvailability) {