From ac13fa610c4ec2b741731ff917d7cc38b01fb2e7 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sat, 10 Feb 2024 14:17:35 -0600 Subject: [PATCH] Move DNS topology setup earlier in cluster creation This is needed because setting the bastion public name field depends on the DNS topology. We were incorrectly setting bastion.publicName for dns=none clusters because the dns=none field wasn't yet set on the cluster. --- upup/pkg/fi/cloudup/new_cluster.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index 4953ff1057..14e9e3ee9b 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -1267,6 +1267,12 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S } cluster.Spec.Networking.Topology = &api.TopologySpec{} + + err := setupDNSTopology(opt, cluster) + if err != nil { + return nil, err + } + switch opt.Topology { case api.TopologyPublic: @@ -1405,10 +1411,6 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S } } - err := setupDNSTopology(opt, cluster) - if err != nil { - return nil, err - } return bastions, nil }