diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml index e2028a46cf..d9e10cdc2f 100644 --- a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -41,7 +43,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cilium: @@ -58,7 +59,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml index 2deffc8ff7..bdfd6411f3 100644 --- a/tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex-private/expected-v1alpha2.yaml @@ -58,7 +58,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.complex.example.com networkCIDR: 10.0.0.0/16 networking: cni: {} @@ -126,7 +125,7 @@ spec: bastion: bastionPublicName: bastion.complex.example.com dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index a76e82481e..5e8bbee12f 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -10,7 +10,9 @@ spec: - 10.3.0.0/16 - 10.4.0.0/16 api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -56,7 +58,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.complex.example.com networkCIDR: 10.0.0.0/16 networking: cni: {} @@ -94,7 +95,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml index 86bb9a886f..adf20476d5 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -5,7 +5,8 @@ metadata: name: gce.example.com spec: api: - dns: {} + loadBalancer: + type: Public authorization: rbac: {} channel: stable @@ -39,7 +40,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.21.0 - masterPublicName: api.gce.example.com networking: cni: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -54,7 +54,7 @@ spec: type: Public topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index a6c4dcf8df..b98f42ff6d 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: ha.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -51,7 +53,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.ha.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -74,7 +75,7 @@ spec: zone: us-test-1c topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index d25da4b2b7..dd2a885c8f 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: ha.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -51,7 +53,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.21.0 - masterPublicName: api.ha.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -74,7 +75,7 @@ spec: zone: us-test-1c topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index bccc741739..1e47a4041c 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -5,7 +5,8 @@ metadata: name: ha-gce.example.com spec: api: - dns: {} + loadBalancer: + type: Public authorization: rbac: {} channel: stable @@ -46,7 +47,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.ha-gce.example.com networking: cni: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -61,7 +61,7 @@ spec: type: Public topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml index 18065412c5..34c8c69034 100644 --- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: ha.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -51,7 +53,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.ha.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -66,7 +67,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml index 30734c11d7..0ce2fcd97c 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: ha.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -63,7 +65,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.ha.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -82,7 +83,7 @@ spec: zone: us-test-1b topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index ef221f1eea..b6dd03980d 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -41,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.private.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -63,7 +62,7 @@ spec: bastion: bastionPublicName: bastion.private.example.com dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index be33e5eaa0..ecdb2a4afc 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -42,7 +42,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.22.0 - masterPublicName: api.ipv6.example.com networkCIDR: 172.20.0.0/16 networking: calico: {} @@ -67,7 +66,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml index 237101089e..68be07ba61 100644 --- a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: karpenter.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -42,7 +44,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.23.0 - masterPublicName: api.karpenter.example.com networkCIDR: 172.20.0.0/16 networking: calico: {} @@ -68,7 +69,7 @@ spec: zone: us-test-1c topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml index c0ed2b4ecb..ff3feaed53 100644 --- a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.24.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml index cde2160595..d8a4119bb7 100644 --- a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.25.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml index 54be815eff..219fc506b1 100644 --- a/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml index 3f6210cb2d..11bc89a41b 100644 --- a/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml @@ -5,7 +5,8 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + type: Public authorization: rbac: {} channel: stable @@ -38,7 +39,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.minimal.example.com networking: cni: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -53,7 +53,7 @@ spec: type: Public topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml index beb9dd249c..7cf4a01bca 100644 --- a/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -40,7 +42,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -58,7 +59,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml index 99c280fc5e..2beee71856 100644 --- a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml index a02ce84017..154c32543e 100644 --- a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.27.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml index 2c36a47c92..b289a5c5b3 100644 --- a/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.28/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.28.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.29-gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.29-gce/expected-v1alpha2.yaml index 62b7f92a16..fd85f8a796 100644 --- a/tests/integration/create_cluster/minimal-1.29-gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.29-gce/expected-v1alpha2.yaml @@ -5,7 +5,8 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + type: Public authorization: rbac: {} channel: stable @@ -38,7 +39,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.29.0 - masterPublicName: api.minimal.example.com networking: cni: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -53,7 +53,7 @@ spec: type: Public topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml index 16e80af215..6f3df85b24 100644 --- a/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.29/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.29.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -54,7 +55,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml index 411bfee82e..07806033ac 100644 --- a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: minimal.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -63,7 +65,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -78,7 +79,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 93917317df..9153ed5537 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -41,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.private.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -63,7 +62,7 @@ spec: bastion: bastionPublicName: bastion.private.example.com dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 893db64439..80661748fa 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: overrides.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.overrides.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -57,7 +58,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 768396c52a..01a56a3ae5 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -45,7 +45,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.private.example.com networkCIDR: 172.20.0.0/16 networking: cni: {} @@ -66,7 +65,7 @@ spec: bastion: bastionPublicName: bastion.private.example.com dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml index 50966b8814..f0fedae6fc 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -44,7 +44,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.private.example.com networking: cni: {} nonMasqueradeCIDR: 100.64.0.0/10 @@ -61,7 +60,7 @@ spec: bastion: bastionPublicName: bastion.private.example.com dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml index b46ccea4dd..0b646aef8f 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -41,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.private-subnets.example.com networkCIDR: 10.0.0.0/12 networkID: vpc-12345678 networking: @@ -63,7 +62,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml index 0b4b23cbe9..3e3f909086 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: subnet.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.subnet.example.com networkCIDR: 10.0.0.0/12 networkID: vpc-12345678 networking: @@ -56,7 +57,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml index 0b4b23cbe9..3e3f909086 100644 --- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: subnet.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.subnet.example.com networkCIDR: 10.0.0.0/12 networkID: vpc-12345678 networking: @@ -56,7 +57,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 172b053376..e1958ee76b 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -5,7 +5,9 @@ metadata: name: vpc.example.com spec: api: - dns: {} + loadBalancer: + class: Network + type: Public authorization: rbac: {} channel: stable @@ -39,7 +41,6 @@ spec: - 0.0.0.0/0 - ::/0 kubernetesVersion: v1.26.0 - masterPublicName: api.vpc.example.com networkCIDR: 10.0.0.0/12 networkID: vpc-12345678 networking: @@ -55,7 +56,7 @@ spec: zone: us-test-1a topology: dns: - type: Public + type: None --- diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index d54c41f07b..4953ff1057 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -1418,13 +1418,12 @@ func setupDNSTopology(opt *NewClusterOptions, cluster *api.Cluster) error { if opt.DNSZone != "" { // Use dns=public if zone is specified cluster.Spec.Networking.Topology.DNS = api.DNSTypePublic - } else if cluster.UsesLegacyGossip() { - // Use dns=none if .k8s.local is specified instead of Gossip - klog.Warningf("Gossip is deprecated, using None DNS instead") - cluster.Spec.Networking.Topology.DNS = api.DNSTypeNone - } else if cluster.Spec.GetCloudProvider() == api.CloudProviderAWS || cluster.Spec.GetCloudProvider() == api.CloudProviderGCE { - cluster.Spec.Networking.Topology.DNS = api.DNSTypePublic } else { + if cluster.UsesLegacyGossip() { + // Warn about using dns=none instead of Gossip + klog.Warningf("Gossip is deprecated, using None DNS instead") + } + // Default to dns=none instead of dns=public for all cloud providers cluster.Spec.Networking.Topology.DNS = api.DNSTypeNone } case "public":