From e8436cc76ba0e615d0e07d29afaedae92ff6c180 Mon Sep 17 00:00:00 2001 From: MonzElmasry Date: Wed, 28 Oct 2020 21:55:10 +0200 Subject: [PATCH] Make etcd use node private ip Signed-off-by: MonzElmasry --- 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 501b04e1eda..2d80ca222f2 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 16913ca8d02..62f52145f74 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 b979a418ea1..cc26bfa45d7 100644 --- a/pkg/etcd/etcd.go +++ b/pkg/etcd/etcd.go @@ -267,12 +267,11 @@ func (e *ETCD) Register(ctx context.Context, config *config.Control, l net.Liste } e.client = client - address, err := getAdvertiseAddress(config.AdvertiseIP) + address, err := getAdvertiseAddress(config.PrivateIP) if err != nil { return nil, 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