Merge pull request #16342 from rifelpet/dns-topology

Move DNS topology setup earlier in cluster creation

tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml

@@ -122,8 +122,6 @@ spec:
     type: Utility
     zone: us-test-1a
   topology:
-    bastion:
-      bastionPublicName: bastion.complex.example.com
     dns:
       type: None
 

tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml

@@ -59,8 +59,6 @@ spec:
     type: Utility
     zone: us-test-1a
   topology:
-    bastion:
-      bastionPublicName: bastion.private.example.com
     dns:
       type: None
 

tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml

@@ -59,8 +59,6 @@ spec:
     type: Utility
     zone: us-test-1a
   topology:
-    bastion:
-      bastionPublicName: bastion.private.example.com
     dns:
       type: None
 

tests/integration/create_cluster/private/expected-v1alpha2.yaml

@@ -62,8 +62,6 @@ spec:
     type: Utility
     zone: us-test-1a
   topology:
-    bastion:
-      bastionPublicName: bastion.private.example.com
     dns:
       type: None
 

tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml

@@ -57,8 +57,6 @@ spec:
     region: us-test1
     type: Private
   topology:
-    bastion:
-      bastionPublicName: bastion.private.example.com
     dns:
       type: None
 

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
 }
 

upup/pkg/fi/cloudup/new_cluster_test.go

@@ -87,7 +87,6 @@ func TestCreateEtcdCluster(t *testing.T) {
 func TestSetupNetworking(t *testing.T) {
 	tests := []struct {
 		options  NewClusterOptions
-		actual   api.Cluster
 		expected api.Cluster
 	}{
 		{
@@ -337,6 +336,102 @@ func TestSetupNetworking(t *testing.T) {
 	}
 }
 
+func TestSetupTopology(t *testing.T) {
+	tests := []struct {
+		options  NewClusterOptions
+		skeleton api.Cluster
+		expected api.Cluster
+	}{
+		{
+			options: NewClusterOptions{
+				Topology: api.TopologyPrivate,
+				Bastion:  true,
+			},
+			skeleton: api.Cluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test",
+				},
+				Spec: api.ClusterSpec{
+					KubernetesVersion: "v1.29.0",
+					Networking: api.NetworkingSpec{
+						Topology: &api.TopologySpec{
+							DNS: api.DNSTypeNone,
+						},
+					},
+				},
+			},
+			expected: api.Cluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test",
+				},
+				Spec: api.ClusterSpec{
+					KubernetesVersion: "v1.29.0",
+					Networking: api.NetworkingSpec{
+						Topology: &api.TopologySpec{
+							DNS: api.DNSTypeNone,
+						},
+					},
+				},
+			},
+		},
+		{
+			options: NewClusterOptions{
+				Topology: api.TopologyPrivate,
+				DNSType:  string(api.DNSTypePublic),
+				Bastion:  true,
+			},
+			skeleton: api.Cluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test",
+				},
+				Spec: api.ClusterSpec{
+					KubernetesVersion: "v1.29.0",
+					Networking: api.NetworkingSpec{
+						Topology: &api.TopologySpec{
+							DNS: api.DNSTypePublic,
+						},
+					},
+				},
+			},
+			expected: api.Cluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test",
+				},
+				Spec: api.ClusterSpec{
+					KubernetesVersion: "v1.29.0",
+					Networking: api.NetworkingSpec{
+						Topology: &api.TopologySpec{
+							DNS: api.DNSTypePublic,
+							Bastion: &api.BastionSpec{
+								PublicName: "bastion.test",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		_, err := setupTopology(&test.options, &test.skeleton, nil)
+		if err != nil {
+			t.Errorf("error during topology setup: %v", err)
+		}
+		expectedYaml, err := yaml.Marshal(test.expected)
+		if err != nil {
+			t.Errorf("error converting expected cluster spec to yaml: %v", err)
+		}
+		actualYaml, err := yaml.Marshal(&test.skeleton)
+		if err != nil {
+			t.Errorf("error converting actual cluster spec to yaml: %v", err)
+		}
+		if string(expectedYaml) != string(actualYaml) {
+			diffString := diff.FormatDiff(string(expectedYaml), string(actualYaml))
+			t.Errorf("unexpected cluster topology setup:\n%s", diffString)
+		}
+	}
+}
+
 func TestDefaultImage(t *testing.T) {
 	tests := []struct {
 		cluster      *api.Cluster