From 070b24dc06981efba06aa79998d17a158282f6df Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Mon, 8 Feb 2021 15:28:08 +0200 Subject: [PATCH] Add controller public address to spec.api.sans --- phase/configure_k0s.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/phase/configure_k0s.go b/phase/configure_k0s.go index 35e135b1..e2c0cee3 100644 --- a/phase/configure_k0s.go +++ b/phase/configure_k0s.go @@ -140,17 +140,19 @@ func addUnlessExist(slice *[]string, s string) { } func (p *ConfigureK0s) configFor(h *cluster.Host) (string, error) { + cfg := p.Config.Spec.K0s.Config + + var sans []string + var addr string if h.PrivateAddress != "" { addr = h.PrivateAddress } else { addr = h.Address() } - - cfg := p.Config.Spec.K0s.Config - cfg.DigMapping("spec", "api")["address"] = addr - var sans []string + addUnlessExist(&sans, addr) + oldsans, ok := cfg.Dig("spec", "api", "sans").([]interface{}) if ok { for _, v := range oldsans { @@ -162,13 +164,10 @@ func (p *ConfigureK0s) configFor(h *cluster.Host) (string, error) { var controllers cluster.Hosts = p.Config.Spec.Hosts.Controllers() for _, c := range controllers { - var caddr string + addUnlessExist(&sans, c.Address()) if c.PrivateAddress != "" { - caddr = c.PrivateAddress - } else { - caddr = c.Address() + addUnlessExist(&sans, c.PrivateAddress) } - addUnlessExist(&sans, caddr) } addUnlessExist(&sans, "127.0.0.1") cfg.DigMapping("spec", "api")["sans"] = sans