From f8a4547bec36b4d1597c19c86b5063756d4c150e Mon Sep 17 00:00:00 2001
From: Menna Elmasry <65324011+MonzElmasry@users.noreply.github.com>
Date: Thu, 29 Oct 2020 00:23:56 +0200
Subject: [PATCH] Merge pull request #2448 from MonzElmasry/new_b

Make etcd use node private ip
---
 pkg/cli/server/server.go    | 4 +++-
 pkg/daemons/config/types.go | 4 ++--
 pkg/etcd/etcd.go            | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
index 501b04e1ed..2d80ca222f 100644
--- a/pkg/cli/server/server.go
+++ b/pkg/cli/server/server.go
@@ -130,7 +130,9 @@ func run(app *cli.Context, cfg *cmds.Server) error {
 	if cmds.AgentConfig.FlannelIface != "" && cmds.AgentConfig.NodeIP == "" {
 		cmds.AgentConfig.NodeIP = netutil.GetIPFromInterface(cmds.AgentConfig.FlannelIface)
 	}
-
+	if serverConfig.ControlConfig.PrivateIP == "" && cmds.AgentConfig.NodeIP != "" {
+		serverConfig.ControlConfig.PrivateIP = cmds.AgentConfig.NodeIP
+	}
 	if serverConfig.ControlConfig.AdvertiseIP == "" && cmds.AgentConfig.NodeExternalIP != "" {
 		serverConfig.ControlConfig.AdvertiseIP = cmds.AgentConfig.NodeExternalIP
 	}
diff --git a/pkg/daemons/config/types.go b/pkg/daemons/config/types.go
index 16913ca8d0..62f52145f7 100644
--- a/pkg/daemons/config/types.go
+++ b/pkg/daemons/config/types.go
@@ -137,8 +137,8 @@ type Control struct {
 
 	BindAddress string
 	SANs        []string
-
-	Runtime *ControlRuntime `json:"-"`
+	PrivateIP   string
+	Runtime     *ControlRuntime `json:"-"`
 }
 
 type ControlRuntimeBootstrap struct {
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index 69386c6d0a..4ddf162b76 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -309,12 +309,11 @@ func (e *ETCD) Register(ctx context.Context, config *config.Control, handler htt
 	}
 	e.client = client
 
-	address, err := getAdvertiseAddress(config.AdvertiseIP)
+	address, err := getAdvertiseAddress(config.PrivateIP)
 	if err != nil {
 		return nil, err
 	}
 	e.address = address
-
 	e.config.Datastore.Endpoint = endpoint
 	e.config.Datastore.Config.CAFile = e.runtime.ETCDServerCA
 	e.config.Datastore.Config.CertFile = e.runtime.ClientETCDCert