From 9b647071590a4bccc5edfcc7aecdf2ea6377bfd4 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Wed, 19 Jul 2023 08:48:38 -0700 Subject: [PATCH 1/2] Ignore no-longer-used topology fields in ClusterSpec --- docs/getting_started/gce.md | 2 -- docs/manifests_and_customizing_via_api.md | 2 -- docs/tutorial/upgrading-kubernetes.md | 2 -- examples/kops-api-example/up.go | 6 ---- k8s/crds/kops.k8s.io_clusters.yaml | 6 ++-- .../containerdbuilder/flatcar/cluster.yaml | 3 -- .../from_docker_19.03.11/cluster.yaml | 3 -- .../from_docker_19.03.14/cluster.yaml | 3 -- .../containerdbuilder/simple/cluster.yaml | 3 -- .../skipinstall/cluster.yaml | 3 -- .../docker_19.03.11/cluster.yaml | 3 -- .../dockerbuilder/healthcheck/cluster.yaml | 3 -- .../tests/dockerbuilder/logflags/cluster.yaml | 3 -- .../dockerbuilder/skipinstall/cluster.yaml | 3 -- .../pkg/model/tests/golden/audit/cluster.yaml | 3 -- .../model/tests/golden/awsiam/cluster.yaml | 3 -- .../golden/dedicated-apiserver/cluster.yaml | 3 -- .../golden/hooks-containerd-exec/cluster.yaml | 3 -- .../golden/hooks-docker-exec/cluster.yaml | 3 -- .../model/tests/golden/minimal/cluster.yaml | 3 -- .../pkg/model/tests/golden/oidc/cluster.yaml | 3 -- .../tests/golden/side-loading/cluster.yaml | 3 -- .../golden/without-etcd-events/cluster.yaml | 3 -- .../tests/kubelet/featuregates/cluster.yaml | 3 -- .../model/tests/kubelet/warmpool/cluster.yaml | 3 -- nodeup/pkg/model/tests/protokube/cluster.yaml | 3 -- .../automatic/cluster.yaml | 3 -- .../external/cluster.yaml | 3 -- pkg/apis/kops/cluster.go | 2 +- pkg/apis/kops/topology.go | 4 +-- pkg/apis/kops/v1alpha2/defaults.go | 4 --- pkg/apis/kops/v1alpha2/topology.go | 4 +-- pkg/apis/kops/v1alpha3/defaults.go | 4 --- pkg/apis/kops/v1alpha3/topology.go | 4 +-- pkg/apis/kops/validation/validation.go | 18 ----------- pkg/instancegroups/rollingupdate_os_test.go | 3 -- .../etcdmanager/tests/interval/cluster.yaml | 3 -- .../etcdmanager/tests/minimal/cluster.yaml | 3 -- .../tests/overwrite_settings/cluster.yaml | 3 -- .../etcdmanager/tests/proxy/cluster.yaml | 3 -- .../kubeapiserver/tests/minimal/cluster.yaml | 3 -- .../completed-cluster.yaml | 2 -- .../tests/minimal/completed-cluster.yaml | 2 -- .../tests/mixing/completed-cluster.yaml | 2 -- pkg/model/openstackmodel/servergroup_test.go | 19 +++--------- pkg/testutils/cluster.go | 4 +-- .../podidentitywebhook/cluster.yaml.tmpl | 3 -- .../templates/apiserver-dns-none.yaml.tmpl | 2 -- tests/e2e/templates/apiserver.yaml.tmpl | 2 -- tests/e2e/templates/many-addons.yaml.tmpl | 3 -- tests/e2e/templates/simple.yaml.tmpl | 3 -- .../e2e/templates/staticcpumanagerpolicy.tmpl | 3 -- .../integration/conversion/aws/v1alpha2.yaml | 2 -- .../integration/conversion/aws/v1alpha3.yaml | 2 -- .../conversion/azure/v1alpha2.yaml | 2 -- .../conversion/azure/v1alpha3.yaml | 2 -- .../conversion/canal/v1alpha2.yaml | 2 -- .../conversion/canal/v1alpha3.yaml | 2 -- .../conversion/cilium/v1alpha2.yaml | 2 -- .../conversion/cilium/v1alpha3.yaml | 2 -- tests/integration/conversion/do/v1alpha2.yaml | 2 -- tests/integration/conversion/do/v1alpha3.yaml | 2 -- .../integration/conversion/gce/v1alpha2.yaml | 2 -- .../integration/conversion/gce/v1alpha3.yaml | 2 -- .../conversion/minimal/legacy-v1alpha2.yaml | 2 -- .../conversion/minimal/v1alpha2.yaml | 2 -- .../conversion/minimal/v1alpha3.yaml | 2 -- .../conversion/openstack/v1alpha2.yaml | 2 -- .../conversion/openstack/v1alpha3.yaml | 2 -- .../cilium-eni/expected-v1alpha2.yaml | 2 -- .../complex/expected-v1alpha2.yaml | 2 -- .../different-amis/expected-v1alpha2.yaml | 2 -- .../gce_byo_sa/expected-v1alpha2.yaml | 2 -- .../create_cluster/ha/expected-v1alpha2.yaml | 2 -- .../ha_encrypt/expected-v1alpha2.yaml | 2 -- .../ha_gce/expected-v1alpha2.yaml | 2 -- .../ha_hetzner/expected-v1alpha2.yaml | 2 -- .../ha_openstack/expected-v1alpha2.yaml | 2 -- .../ha_openstack_nodns/expected-v1alpha2.yaml | 2 -- .../expected-v1alpha2.yaml | 2 -- .../ha_shared_zone/expected-v1alpha2.yaml | 2 -- .../ha_shared_zones/expected-v1alpha2.yaml | 2 -- .../ingwspecified/expected-v1alpha2.yaml | 2 -- .../ipv6/expected-v1alpha2.yaml | 2 -- .../karpenter/expected-v1alpha2.yaml | 2 -- .../minimal-1.23/expected-v1alpha2.yaml | 2 -- .../minimal-1.24/expected-v1alpha2.yaml | 2 -- .../minimal-1.25/expected-v1alpha2.yaml | 2 -- .../minimal-1.26-arm64/expected-v1alpha2.yaml | 2 -- .../expected-v1alpha2.yaml | 2 -- .../minimal-1.26-gce/expected-v1alpha2.yaml | 2 -- .../minimal-1.26-irsa/expected-v1alpha2.yaml | 2 -- .../minimal-1.26/expected-v1alpha2.yaml | 2 -- .../minimal-1.27/expected-v1alpha2.yaml | 2 -- .../expected-v1alpha2.yaml | 2 -- .../minimal_hetzner/expected-v1alpha2.yaml | 2 -- .../ngwspecified/expected-v1alpha2.yaml | 2 -- .../overrides/expected-v1alpha2.yaml | 2 -- .../private/expected-v1alpha2.yaml | 2 -- .../private_gce/expected-v1alpha2.yaml | 2 -- .../expected-v1alpha2.yaml | 2 -- .../shared_subnets/expected-v1alpha2.yaml | 2 -- .../expected-v1alpha2.yaml | 2 -- .../shared_vpc/expected-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../additionalobjects/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../apiservernodes/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../aws-lb-controller/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../complex/in-legacy-v1alpha2.yaml | 3 -- .../update_cluster/complex/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/compress/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../containerd-custom/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../containerd/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/digit/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../docker-custom/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../existing_iam/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../existing_sg/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../external_dns/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../external_dns_irsa/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../externallb/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../externalpolicies/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/ha/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/ha_gce/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/irsa/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/karpenter/in-v1alpha2.yaml | 3 -- .../lifecycle_phases/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-ccm-irsa/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-ccm-irsa23/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-ccm-irsa24/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-ccm-irsa25/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-ccm-irsa26/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-ccm/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons-gce/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../many-addons/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-1.23/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-1.24/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-1.25/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-1.26/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-1.27/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-dns-none/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-etcd/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-gp3/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-ipv6-calico/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-ipv6-cilium/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-ipv6/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-longclustername/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal-warmpool/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/minimal/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gce/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gce_dns-none/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gce_ilb/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gce_plb/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gce_private/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gossip/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_gossip_irsa/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_hetzner/in-v1alpha2.yaml | 2 -- .../minimal_openstack/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../minimal_scaleway/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../mixed_instances/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../mixed_instances_spot/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../nth-imds-processor-irsa/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../nth-imds-processor/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/nvidia/in-v1alpha2.yaml | 3 -- .../openstack_floatingip/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../private-shared-ip/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../private-shared-subnet/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatecalico/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatecanal/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatecilium-eni/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatecilium/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatecilium2/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privateciliumadvanced/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatedns1/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatedns2/in-v1alpha2.yaml | 2 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privateflannel/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../privatekopeio/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../public-jwks-apiserver/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../shared_subnet/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../shared_vpc/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../shared_vpc_ipv6/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/unmanaged/in-v1alpha2.yaml | 3 -- ...s_s3_object_cluster-completed.spec_content | 2 -- .../update_cluster/vfs-said/in-v1alpha2.yaml | 3 -- upup/pkg/fi/cloudup/defaults.go | 2 +- upup/pkg/fi/cloudup/new_cluster.go | 13 ++------ .../fi/cloudup/populate_cluster_spec_test.go | 31 ------------------- .../amazonvpc-containerd/cluster.yaml | 3 -- .../amazonvpc/cluster.yaml | 3 -- .../awscloudcontroller/cluster.yaml | 3 -- .../awsiamauthenticator/crd/cluster.yaml | 3 -- .../awsiamauthenticator/mappings/cluster.yaml | 3 -- .../cilium/cluster.yaml | 3 -- .../coredns/cluster.yaml | 3 -- .../metrics-server/insecure-1.19/cluster.yaml | 3 -- .../metrics-server/secure-1.19/cluster.yaml | 3 -- .../service-account-iam/cluster.yaml | 3 -- .../simple/cluster.yaml | 3 -- 280 files changed, 18 insertions(+), 737 deletions(-) diff --git a/docs/getting_started/gce.md b/docs/getting_started/gce.md index 8a42c7ebf1d5a..4c3291121ce17 100644 --- a/docs/getting_started/gce.md +++ b/docs/getting_started/gce.md @@ -102,8 +102,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public ``` Similarly, you can also see your InstanceGroups using: diff --git a/docs/manifests_and_customizing_via_api.md b/docs/manifests_and_customizing_via_api.md index ad9e97e5b469b..81650dee4a83d 100644 --- a/docs/manifests_and_customizing_via_api.md +++ b/docs/manifests_and_customizing_via_api.md @@ -128,8 +128,6 @@ spec: bastionPublicName: bastion.k8s.example.com dns: type: Public - masters: private - nodes: private --- diff --git a/docs/tutorial/upgrading-kubernetes.md b/docs/tutorial/upgrading-kubernetes.md index 1c4b78452568d..06d5d58b2aecb 100644 --- a/docs/tutorial/upgrading-kubernetes.md +++ b/docs/tutorial/upgrading-kubernetes.md @@ -59,8 +59,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public ``` Edit `kubernetesVersion`, changing it to `1.17.7` for example. diff --git a/examples/kops-api-example/up.go b/examples/kops-api-example/up.go index a308cb8c0de41..8d7221b2bc214 100644 --- a/examples/kops-api-example/up.go +++ b/examples/kops-api-example/up.go @@ -41,12 +41,6 @@ func up(vfsContext *vfs.VFSContext, ctx context.Context) error { AWS: &api.AWSSpec{}, }, ConfigBase: registryBase.Join(cluster.ObjectMeta.Name).Path(), - Networking: api.NetworkingSpec{ - Topology: &api.TopologySpec{ - ControlPlane: api.TopologyPublic, - Nodes: api.TopologyPublic, - }, - }, } for _, z := range nodeZones { diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index b79edc1333c1d..42afe07894934 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -5721,12 +5721,10 @@ spec: type: string type: object masters: - description: The environment to launch the Kubernetes masters - in public|private + description: ControlPlane is not used. type: string nodes: - description: The environment to launch the Kubernetes nodes in - public|private + description: Nodes is not used. type: string type: object updatePolicy: diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml index 66c7d54a52448..ba881908e1e18 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml index 3e13495c5a93e..d505851915a8c 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml index ead52ac01b634..4ad35d00d411c 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml index 66c7d54a52448..ba881908e1e18 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml index e2c8d3b9a0cd5..a63c2783c4b3b 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml index 94e141a4322e6..56822d039176e 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml @@ -31,9 +31,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml index f1aba6f14dcc2..01b1ee2ce5920 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml @@ -31,9 +31,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml index 9d3bebe04c79c..38c84c62f9a47 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml index b42134ecec95f..bae97b687c9cb 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/audit/cluster.yaml b/nodeup/pkg/model/tests/golden/audit/cluster.yaml index c4073e4eb61b2..052d1487ff6ac 100644 --- a/nodeup/pkg/model/tests/golden/audit/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/audit/cluster.yaml @@ -75,9 +75,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml b/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml index d94314db5c607..e2c9742a4139b 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml @@ -40,9 +40,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml index c6064ad2b706d..0c8e216556df9 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml @@ -38,9 +38,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml b/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml index f9cedc943ee7d..a21b60564aba9 100644 --- a/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/hooks-containerd-exec/cluster.yaml @@ -38,9 +38,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml b/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml index 2ea2b8691b0c5..fda93f30c04f7 100644 --- a/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/hooks-docker-exec/cluster.yaml @@ -38,9 +38,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/minimal/cluster.yaml b/nodeup/pkg/model/tests/golden/minimal/cluster.yaml index 7cfc8ddb6026b..6442531e0747f 100644 --- a/nodeup/pkg/model/tests/golden/minimal/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/cluster.yaml @@ -38,9 +38,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/oidc/cluster.yaml b/nodeup/pkg/model/tests/golden/oidc/cluster.yaml index 030f368189503..3b40f91b6e2c8 100644 --- a/nodeup/pkg/model/tests/golden/oidc/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/oidc/cluster.yaml @@ -48,9 +48,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml b/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml index c2a327cdcd83b..b3dc82354bb0e 100644 --- a/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/side-loading/cluster.yaml @@ -38,9 +38,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml index 516d008b6d80e..b404e9230b600 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml @@ -29,9 +29,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml index 9e3cc2546e54b..014d45fb5859e 100644 --- a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml +++ b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml @@ -33,9 +33,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml b/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml index db10bc6da6a2e..957b023f66c8c 100644 --- a/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml +++ b/nodeup/pkg/model/tests/kubelet/warmpool/cluster.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/protokube/cluster.yaml b/nodeup/pkg/model/tests/protokube/cluster.yaml index 32a121cfa58f1..e1f8600dbdf79 100644 --- a/nodeup/pkg/model/tests/protokube/cluster.yaml +++ b/nodeup/pkg/model/tests/protokube/cluster.yaml @@ -34,9 +34,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml b/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml index 32a121cfa58f1..e1f8600dbdf79 100644 --- a/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml +++ b/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml @@ -34,9 +34,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml b/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml index b2077366b862d..e7220c8d40a82 100644 --- a/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml +++ b/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml @@ -34,9 +34,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index a81cb981566de..47bb59eb5ce32 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -813,7 +813,7 @@ func (t *TerraformSpec) IsEmpty() bool { func (c *Cluster) FillDefaults() error { // Topology support if c.Spec.Networking.Topology == nil { - c.Spec.Networking.Topology = &TopologySpec{ControlPlane: TopologyPublic, Nodes: TopologyPublic, DNS: DNSTypePublic} + c.Spec.Networking.Topology = &TopologySpec{DNS: DNSTypePublic} } if c.Spec.Channel == "" { diff --git a/pkg/apis/kops/topology.go b/pkg/apis/kops/topology.go index 0c288569cb916..a1870e2966ce4 100644 --- a/pkg/apis/kops/topology.go +++ b/pkg/apis/kops/topology.go @@ -33,10 +33,10 @@ var SupportedDnsTypes = []DNSType{ } type TopologySpec struct { - // ControlPlane specifies the environment for launching the control plane nodes. (public, private) + // ControlPlane is not used. ControlPlane string `json:"controlPlane,omitempty"` - // Nodes specifies the environment for launching the worker nodes. (public, private) + // Nodes is not used. Nodes string `json:"nodes,omitempty"` // Bastion provide an external facing point of entry into a network diff --git a/pkg/apis/kops/v1alpha2/defaults.go b/pkg/apis/kops/v1alpha2/defaults.go index f8c312084229a..c5e4598f2141e 100644 --- a/pkg/apis/kops/v1alpha2/defaults.go +++ b/pkg/apis/kops/v1alpha2/defaults.go @@ -37,10 +37,6 @@ func SetDefaults_ClusterSpec(obj *ClusterSpec) { obj.Topology = &TopologySpec{} } - rebindIfEmpty(&obj.Topology.ControlPlane, TopologyPublic) - - rebindIfEmpty(&obj.Topology.Nodes, TopologyPublic) - if obj.Topology.LegacyDNS == nil { obj.Topology.LegacyDNS = &DNSSpec{} } diff --git a/pkg/apis/kops/v1alpha2/topology.go b/pkg/apis/kops/v1alpha2/topology.go index d1c14a14a61f4..21f178342567c 100644 --- a/pkg/apis/kops/v1alpha2/topology.go +++ b/pkg/apis/kops/v1alpha2/topology.go @@ -22,10 +22,10 @@ const ( ) type TopologySpec struct { - // The environment to launch the Kubernetes masters in public|private + // ControlPlane is not used. ControlPlane string `json:"masters,omitempty"` - // The environment to launch the Kubernetes nodes in public|private + // Nodes is not used. Nodes string `json:"nodes,omitempty"` // Bastion provide an external facing point of entry into a network diff --git a/pkg/apis/kops/v1alpha3/defaults.go b/pkg/apis/kops/v1alpha3/defaults.go index 36fc0c8b54add..3dae1c0b7fe55 100644 --- a/pkg/apis/kops/v1alpha3/defaults.go +++ b/pkg/apis/kops/v1alpha3/defaults.go @@ -37,10 +37,6 @@ func SetDefaults_ClusterSpec(obj *ClusterSpec) { obj.Networking.Topology = &TopologySpec{} } - rebindIfEmpty(&obj.Networking.Topology.ControlPlane, TopologyPublic) - - rebindIfEmpty(&obj.Networking.Topology.Nodes, TopologyPublic) - if obj.Networking.Topology.DNS == "" { obj.Networking.Topology.DNS = DNSTypePublic } diff --git a/pkg/apis/kops/v1alpha3/topology.go b/pkg/apis/kops/v1alpha3/topology.go index 103185b982474..9925713a3e7ca 100644 --- a/pkg/apis/kops/v1alpha3/topology.go +++ b/pkg/apis/kops/v1alpha3/topology.go @@ -22,10 +22,10 @@ const ( ) type TopologySpec struct { - // ControlPlane specifies the environment for launching the control plane nodes. (public, private) + // ControlPlane is not used. ControlPlane string `json:"controlPlane,omitempty"` - // Nodes specifies the environment for launching the worker nodes. (public, private) + // Nodes is not used. Nodes string `json:"nodes,omitempty"` // Bastion provide an external facing point of entry into a network diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 8a146d3f66168..c1bffaf59b24f 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -503,24 +503,6 @@ func validateIPv6CIDR(fieldPath *field.Path, cidr string, serviceClusterIPRange func validateTopology(c *kops.Cluster, topology *kops.TopologySpec, fieldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} - if topology.ControlPlane == "" { - allErrs = append(allErrs, field.Required(fieldPath.Child("controlPlane"), "")) - } else { - allErrs = append(allErrs, IsValidValue(fieldPath.Child("controlPlane"), &topology.ControlPlane, kops.SupportedTopologies)...) - } - - if topology.Nodes == "" { - allErrs = append(allErrs, field.Required(fieldPath.Child("nodes"), "")) - } else { - allErrs = append(allErrs, IsValidValue(fieldPath.Child("nodes"), &topology.Nodes, kops.SupportedTopologies)...) - } - - if topology.Bastion != nil { - if topology.ControlPlane == kops.TopologyPublic || topology.Nodes == kops.TopologyPublic { - allErrs = append(allErrs, field.Forbidden(fieldPath.Child("bastion"), "bastion requires control plane and nodes to have private topology")) - } - } - if topology.DNS != "" { allErrs = append(allErrs, IsValidValue(fieldPath.Child("dns", "type"), &topology.DNS, kops.SupportedDnsTypes)...) } diff --git a/pkg/instancegroups/rollingupdate_os_test.go b/pkg/instancegroups/rollingupdate_os_test.go index b9cd4af870fec..9d05ce63991fd 100644 --- a/pkg/instancegroups/rollingupdate_os_test.go +++ b/pkg/instancegroups/rollingupdate_os_test.go @@ -50,9 +50,6 @@ func getTestSetupOS(t *testing.T, ctx context.Context) (*RollingUpdateCluster, * inCluster.Spec.CloudProvider.Openstack = &kopsapi.OpenstackSpec{} inCluster.Name = "test.k8s.local" - inCluster.Spec.Networking.Topology.ControlPlane = kopsapi.TopologyPrivate - inCluster.Spec.Networking.Topology.Nodes = kopsapi.TopologyPrivate - err := cloudup.PerformAssignments(inCluster, vfs.Context, mockcloud) if err != nil { t.Fatalf("Failed to perform assignments: %v", err) diff --git a/pkg/model/components/etcdmanager/tests/interval/cluster.yaml b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml index f8617d13d63eb..70c5f495c6bae 100644 --- a/pkg/model/components/etcdmanager/tests/interval/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml @@ -41,9 +41,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml index 10d4c92514a94..9ff9b16dc94b9 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml @@ -36,9 +36,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml index 80b07f04254a4..ca53d69d23615 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml @@ -46,9 +46,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml b/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml index c89515b9f53ea..99d5490024eba 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml @@ -40,9 +40,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml b/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml index 66f2cf081bae9..1dac7d0b050f0 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml @@ -17,9 +17,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/pkg/model/components/kubescheduler/tests/kubeschedulerconfig/completed-cluster.yaml b/pkg/model/components/kubescheduler/tests/kubeschedulerconfig/completed-cluster.yaml index 6507a7add90f9..cbaeb79cb6767 100644 --- a/pkg/model/components/kubescheduler/tests/kubeschedulerconfig/completed-cluster.yaml +++ b/pkg/model/components/kubescheduler/tests/kubeschedulerconfig/completed-cluster.yaml @@ -9,6 +9,4 @@ spec: kubernetesVersion: v1.24.0 networking: topology: - controlPlane: public dns: Public - nodes: public diff --git a/pkg/model/components/kubescheduler/tests/minimal/completed-cluster.yaml b/pkg/model/components/kubescheduler/tests/minimal/completed-cluster.yaml index d85f4e83e7b95..faa5ee98bdd0c 100644 --- a/pkg/model/components/kubescheduler/tests/minimal/completed-cluster.yaml +++ b/pkg/model/components/kubescheduler/tests/minimal/completed-cluster.yaml @@ -9,6 +9,4 @@ spec: kubernetesVersion: v1.26.0 networking: topology: - controlPlane: public dns: Public - nodes: public diff --git a/pkg/model/components/kubescheduler/tests/mixing/completed-cluster.yaml b/pkg/model/components/kubescheduler/tests/mixing/completed-cluster.yaml index 44acb6b4ba1cb..848b0f295e464 100644 --- a/pkg/model/components/kubescheduler/tests/mixing/completed-cluster.yaml +++ b/pkg/model/components/kubescheduler/tests/mixing/completed-cluster.yaml @@ -11,6 +11,4 @@ spec: kubernetesVersion: v1.24.0 networking: topology: - controlPlane: public dns: Public - nodes: public diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go index 8aefc35262963..d4c95c60fd25c 100644 --- a/pkg/model/openstackmodel/servergroup_test.go +++ b/pkg/model/openstackmodel/servergroup_test.go @@ -139,10 +139,7 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Region: "region", }, }, - Topology: &kops.TopologySpec{ - ControlPlane: "private", - Nodes: "private", - }, + Topology: &kops.TopologySpec{}, }, }, }, @@ -356,10 +353,7 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Region: "region", }, }, - Topology: &kops.TopologySpec{ - ControlPlane: kops.TopologyPublic, - Nodes: kops.TopologyPublic, - }, + Topology: &kops.TopologySpec{}, }, }, }, @@ -434,10 +428,7 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Type: kops.SubnetTypePrivate, }, }, - Topology: &kops.TopologySpec{ - ControlPlane: kops.TopologyPrivate, - Nodes: kops.TopologyPrivate, - }, + Topology: &kops.TopologySpec{}, }, }, }, @@ -594,9 +585,7 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { }, }, Topology: &kops.TopologySpec{ - ControlPlane: kops.TopologyPrivate, - DNS: kops.DNSTypeNone, - Nodes: kops.TopologyPrivate, + DNS: kops.DNSTypeNone, }, }, }, diff --git a/pkg/testutils/cluster.go b/pkg/testutils/cluster.go index 090b3eec8ee96..995434bec3977 100644 --- a/pkg/testutils/cluster.go +++ b/pkg/testutils/cluster.go @@ -42,9 +42,7 @@ func BuildMinimalCluster(clusterName string) *kops.Cluster { // Default to public topology c.Spec.Networking.Topology = &kops.TopologySpec{ - ControlPlane: kops.TopologyPublic, - Nodes: kops.TopologyPublic, - DNS: kops.DNSTypePublic, + DNS: kops.DNSTypePublic, } c.Spec.Networking.NetworkCIDR = "172.20.0.0/16" diff --git a/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl b/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl index e50807357a012..1ed334e52469b 100644 --- a/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl +++ b/tests/e2e/scenarios/podidentitywebhook/cluster.yaml.tmpl @@ -44,9 +44,6 @@ spec: enableAWSOIDCProvider: true sshAccess: - {{.publicIP}} - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: {{$zone}} diff --git a/tests/e2e/templates/apiserver-dns-none.yaml.tmpl b/tests/e2e/templates/apiserver-dns-none.yaml.tmpl index 3f89ca89c0191..0ff7310023888 100644 --- a/tests/e2e/templates/apiserver-dns-none.yaml.tmpl +++ b/tests/e2e/templates/apiserver-dns-none.yaml.tmpl @@ -37,8 +37,6 @@ spec: topology: dns: type: None - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: {{$zone}} diff --git a/tests/e2e/templates/apiserver.yaml.tmpl b/tests/e2e/templates/apiserver.yaml.tmpl index 8b96ae01a0c5f..c4f95b8f5d37d 100644 --- a/tests/e2e/templates/apiserver.yaml.tmpl +++ b/tests/e2e/templates/apiserver.yaml.tmpl @@ -34,8 +34,6 @@ spec: topology: bastion: bastionPublicName: bastion.{{.clusterName}} - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: {{$zone}} diff --git a/tests/e2e/templates/many-addons.yaml.tmpl b/tests/e2e/templates/many-addons.yaml.tmpl index a8b8ce25016a6..0089b1b55a119 100644 --- a/tests/e2e/templates/many-addons.yaml.tmpl +++ b/tests/e2e/templates/many-addons.yaml.tmpl @@ -53,9 +53,6 @@ spec: enabled: true sshAccess: - {{.publicIP}} - topology: - masters: public - nodes: public subnets: {{ range $index, $zone := .zones }} - cidr: 172.20.{{$index}}.0/24 diff --git a/tests/e2e/templates/simple.yaml.tmpl b/tests/e2e/templates/simple.yaml.tmpl index 4708d0908cc7e..7a086573905ba 100644 --- a/tests/e2e/templates/simple.yaml.tmpl +++ b/tests/e2e/templates/simple.yaml.tmpl @@ -31,9 +31,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - {{.publicIP}} - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: {{$zone}} diff --git a/tests/e2e/templates/staticcpumanagerpolicy.tmpl b/tests/e2e/templates/staticcpumanagerpolicy.tmpl index 99371582bd073..8ae96f443e319 100644 --- a/tests/e2e/templates/staticcpumanagerpolicy.tmpl +++ b/tests/e2e/templates/staticcpumanagerpolicy.tmpl @@ -41,9 +41,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - {{.publicIP}} - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: {{$zone}} diff --git a/tests/integration/conversion/aws/v1alpha2.yaml b/tests/integration/conversion/aws/v1alpha2.yaml index 88ab7338ddc84..9fbdd11cb8ee5 100644 --- a/tests/integration/conversion/aws/v1alpha2.yaml +++ b/tests/integration/conversion/aws/v1alpha2.yaml @@ -94,8 +94,6 @@ spec: topology: dns: type: None - masters: public - nodes: private warmPool: enableLifecycleHook: true diff --git a/tests/integration/conversion/aws/v1alpha3.yaml b/tests/integration/conversion/aws/v1alpha3.yaml index a21cebbba88a6..820ab830684db 100644 --- a/tests/integration/conversion/aws/v1alpha3.yaml +++ b/tests/integration/conversion/aws/v1alpha3.yaml @@ -92,9 +92,7 @@ spec: zone: us-test-1a tagSubnets: false topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/azure/v1alpha2.yaml b/tests/integration/conversion/azure/v1alpha2.yaml index 0995c8906d1eb..d8a49201fd3dd 100644 --- a/tests/integration/conversion/azure/v1alpha2.yaml +++ b/tests/integration/conversion/azure/v1alpha2.yaml @@ -65,8 +65,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/azure/v1alpha3.yaml b/tests/integration/conversion/azure/v1alpha3.yaml index fdb9c9d3765e9..e0ca6bcfc74c2 100644 --- a/tests/integration/conversion/azure/v1alpha3.yaml +++ b/tests/integration/conversion/azure/v1alpha3.yaml @@ -63,9 +63,7 @@ spec: zone: us-test-1a tagSubnets: false topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/canal/v1alpha2.yaml b/tests/integration/conversion/canal/v1alpha2.yaml index 50ef76ad60c87..88d10676cd052 100644 --- a/tests/integration/conversion/canal/v1alpha2.yaml +++ b/tests/integration/conversion/canal/v1alpha2.yaml @@ -49,8 +49,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/canal/v1alpha3.yaml b/tests/integration/conversion/canal/v1alpha3.yaml index bc0a0219a1da1..0397303f487dd 100644 --- a/tests/integration/conversion/canal/v1alpha3.yaml +++ b/tests/integration/conversion/canal/v1alpha3.yaml @@ -45,9 +45,7 @@ spec: type: Public zone: us-test-1a topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/cilium/v1alpha2.yaml b/tests/integration/conversion/cilium/v1alpha2.yaml index 93e0038b77708..fd9cc8c4ff852 100644 --- a/tests/integration/conversion/cilium/v1alpha2.yaml +++ b/tests/integration/conversion/cilium/v1alpha2.yaml @@ -50,8 +50,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/cilium/v1alpha3.yaml b/tests/integration/conversion/cilium/v1alpha3.yaml index 7c29a4c09d641..a2ce76e305509 100644 --- a/tests/integration/conversion/cilium/v1alpha3.yaml +++ b/tests/integration/conversion/cilium/v1alpha3.yaml @@ -46,9 +46,7 @@ spec: type: Public zone: us-test-1a topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/do/v1alpha2.yaml b/tests/integration/conversion/do/v1alpha2.yaml index e4c89edb0d26d..34fa3ce2a27cf 100644 --- a/tests/integration/conversion/do/v1alpha2.yaml +++ b/tests/integration/conversion/do/v1alpha2.yaml @@ -47,8 +47,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/do/v1alpha3.yaml b/tests/integration/conversion/do/v1alpha3.yaml index 0e3e4e316d36d..251d9c67515db 100644 --- a/tests/integration/conversion/do/v1alpha3.yaml +++ b/tests/integration/conversion/do/v1alpha3.yaml @@ -43,9 +43,7 @@ spec: zone: us-test-1a tagSubnets: false topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/gce/v1alpha2.yaml b/tests/integration/conversion/gce/v1alpha2.yaml index 84fe1ae12ad9f..9613b7e747eb9 100644 --- a/tests/integration/conversion/gce/v1alpha2.yaml +++ b/tests/integration/conversion/gce/v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/gce/v1alpha3.yaml b/tests/integration/conversion/gce/v1alpha3.yaml index ced1a20d41826..369b9125d7ed4 100644 --- a/tests/integration/conversion/gce/v1alpha3.yaml +++ b/tests/integration/conversion/gce/v1alpha3.yaml @@ -51,9 +51,7 @@ spec: zone: us-test-1a tagSubnets: false topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml index b215ad44f2efd..aa324b86dddc4 100644 --- a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml +++ b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml @@ -48,8 +48,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/minimal/v1alpha2.yaml b/tests/integration/conversion/minimal/v1alpha2.yaml index 34b4f298dc02c..6c91fc5f009d5 100644 --- a/tests/integration/conversion/minimal/v1alpha2.yaml +++ b/tests/integration/conversion/minimal/v1alpha2.yaml @@ -48,8 +48,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/minimal/v1alpha3.yaml b/tests/integration/conversion/minimal/v1alpha3.yaml index c86a7da724c93..402f048b78a30 100644 --- a/tests/integration/conversion/minimal/v1alpha3.yaml +++ b/tests/integration/conversion/minimal/v1alpha3.yaml @@ -44,9 +44,7 @@ spec: type: Public zone: us-test-1a topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/conversion/openstack/v1alpha2.yaml b/tests/integration/conversion/openstack/v1alpha2.yaml index ef362cdd17824..c66d4babc9191 100644 --- a/tests/integration/conversion/openstack/v1alpha2.yaml +++ b/tests/integration/conversion/openstack/v1alpha2.yaml @@ -63,8 +63,6 @@ spec: topology: dns: type: None - masters: public - nodes: private --- diff --git a/tests/integration/conversion/openstack/v1alpha3.yaml b/tests/integration/conversion/openstack/v1alpha3.yaml index c77cb0751433c..c13867ec85fdd 100644 --- a/tests/integration/conversion/openstack/v1alpha3.yaml +++ b/tests/integration/conversion/openstack/v1alpha3.yaml @@ -58,9 +58,7 @@ spec: zone: us-test-1a tagSubnets: false topology: - controlPlane: public dns: None - nodes: private sshAccess: - 0.0.0.0/0 diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml index f17a5c72670c6..f69fd7ac49172 100644 --- a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml @@ -59,8 +59,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index c9d67e1688ee7..945e8953682ec 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -54,8 +54,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml b/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml index 6dd621f3c0ad5..de86f191d0a0b 100644 --- a/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml @@ -63,8 +63,6 @@ spec: bastionPublicName: bastion.amis.example.com dns: type: Public - masters: private - nodes: private --- 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 a76e1623bca01..be897cb134ac0 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index c8c26704a2762..325b58748335d 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -75,8 +75,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index e85cfd769c941..ed3b305df63e7 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -75,8 +75,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index 3fb1bc19225a0..11b3b8fa31620 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -62,8 +62,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml index 601a4c8054c83..82ee7ba1f402f 100644 --- a/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml @@ -60,8 +60,6 @@ spec: topology: dns: type: None - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml index a34ed94afcbfb..394b7fbe068c7 100644 --- a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml @@ -75,8 +75,6 @@ spec: topology: dns: type: Private - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml index 9392f49babf5e..acd6e310e78ac 100644 --- a/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml @@ -87,8 +87,6 @@ spec: topology: dns: type: None - masters: private - nodes: private --- diff --git a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml index c374c7031f8c9..e9401db3e4bd7 100644 --- a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml @@ -85,8 +85,6 @@ spec: topology: dns: type: Private - masters: private - nodes: private --- 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 cb56b076016b5..c16541843e1a2 100644 --- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml @@ -67,8 +67,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 295fec17ab4d1..af7a524d331fa 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -83,8 +83,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index 9c90ff380cd63..bf06f54f18175 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -64,8 +64,6 @@ spec: bastionPublicName: bastion.private.example.com dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index c38f596fe6730..16a58283e358e 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -68,8 +68,6 @@ spec: topology: dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml index fb72c7b198f8b..db59acb3105fd 100644 --- a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml @@ -69,8 +69,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml index 5bba40b7b92d1..24c9597c79ef2 100644 --- a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 d3c82ca618bab..4ce7b4b552cfe 100644 --- a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 c276edc19cd12..e5fa144f47e01 100644 --- a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 66b0f26d7f64c..427804d39bc09 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 @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml index 4c21d1ffa2c34..a2f80f828be5d 100644 --- a/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml @@ -54,8 +54,6 @@ spec: topology: dns: type: None - masters: public - nodes: public --- 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 2cc415ae1a8c5..831099ba85de8 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 @@ -54,8 +54,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 32f96fc2973b0..3dfab203abce0 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 @@ -59,8 +59,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 b8633bc1af98d..c2e773bbf690f 100644 --- a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 0446ee6d174ee..644395b8cf623 100644 --- a/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.27/expected-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 e867fd9732190..b4c6fed9acea8 100644 --- a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml @@ -79,8 +79,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml index 26c2d9fe4bd68..ccd62f5e516e9 100644 --- a/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml @@ -52,8 +52,6 @@ spec: topology: dns: type: None - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 80c7b2890ee22..efb12062c95af 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -64,8 +64,6 @@ spec: bastionPublicName: bastion.private.example.com dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 5d925dcb24624..c50bb066e9614 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -58,8 +58,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 782ae26588be4..2e596454f3f19 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -67,8 +67,6 @@ spec: bastionPublicName: bastion.private.example.com dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml index 1f5fcb72a24de..f6bb71b465620 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -62,8 +62,6 @@ spec: bastionPublicName: bastion.private.example.com dns: type: Public - masters: private - nodes: private --- 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 a20c2d6470744..22860d7f4a163 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -64,8 +64,6 @@ spec: topology: dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml index a39cf49562ea0..cbc51c276c380 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -57,8 +57,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- 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 a39cf49562ea0..cbc51c276c380 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 @@ -57,8 +57,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 44d1e22e48842..9901e413100dd 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -56,8 +56,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index 64416703c2508..e3c83ccbdc51b 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -211,5 +211,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml b/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml index 60d4f4ea833fb..236cf45c7e926 100644 --- a/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/additionalobjects/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index 36417fc0e0d4c..a6b6827b57ddb 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -202,5 +202,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml b/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml index 82342191d68f1..705a5c1604084 100644 --- a/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/apiservernodes/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index 399b72a38a5d0..7f14ef7dc7ee3 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -215,5 +215,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml b/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml index bf0b62bad0493..e43afc5a3ca3d 100644 --- a/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/aws-lb-controller/in-v1alpha2.yaml @@ -37,9 +37,6 @@ spec: enableAWSOIDCProvider: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index 05739723cf6fb..12cbdd2c642d5 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -215,5 +215,3 @@ spec: loadBalancer: {} dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml b/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml index ae04f71a349bf..4430912552307 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml @@ -35,8 +35,6 @@ spec: loadBalancer: additionalSecurityGroups: - sg-exampleid - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index 0bdf9b1b8852c..0834babef889f 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -227,5 +227,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml index 028790a01a793..650fb35fad2a9 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/in-v1alpha2.yaml @@ -39,9 +39,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index 2fa21f3cb628b..b9915f09f09a4 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -220,5 +220,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml index 44b994f5aaa5a..e0e03c9c69b7d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/in-v1alpha2.yaml @@ -32,9 +32,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index fc8fa96e5a5c2..9f9735de1957a 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -260,5 +260,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml index 05eaf207f224e..cb8fce4724622 100644 --- a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml @@ -76,9 +76,6 @@ spec: max_retries: "10" filesProviderExtraConfig: profile: "foo" - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml index 8b248c1959f9c..69447acfd0b51 100644 --- a/tests/integration/update_cluster/complex/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-v1alpha2.yaml @@ -77,9 +77,6 @@ spec: max_retries: "10" filesProviderExtraConfig: profile: "foo" - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index e76e3af385462..8f1825492f6b8 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -208,5 +208,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/compress/in-v1alpha2.yaml b/tests/integration/update_cluster/compress/in-v1alpha2.yaml index 75354a14adc6b..5d594d6968a1b 100644 --- a/tests/integration/update_cluster/compress/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/compress/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: sshAccess: - 0.0.0.0/0 sshKeyName: "" - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content index bb2041cbeb97f..466dff2e2466b 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content @@ -216,5 +216,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml b/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml index d8752231a9f00..47265a3d2f4c7 100644 --- a/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/containerd-custom/in-v1alpha2.yaml @@ -40,9 +40,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content index b14f6e05298fb..5c63f5de90d0f 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content @@ -207,5 +207,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/containerd/in-v1alpha2.yaml b/tests/integration/update_cluster/containerd/in-v1alpha2.yaml index f5c3fd923ff02..4885fe0ebf340 100644 --- a/tests/integration/update_cluster/containerd/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/containerd/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index 6b7940dde6efd..99fdc3ef8f1ed 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -232,5 +232,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/digit/in-v1alpha2.yaml b/tests/integration/update_cluster/digit/in-v1alpha2.yaml index 7dce49d6fc0e6..8ecb21f35e02e 100644 --- a/tests/integration/update_cluster/digit/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/digit/in-v1alpha2.yaml @@ -54,9 +54,6 @@ spec: discoveryStore: memfs://discovery.example.com/123.example.com sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content index 0bbcae4cfcb8d..121250de5f565 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content @@ -216,5 +216,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml b/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml index 5b76f977684dc..a542b0891e045 100644 --- a/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/docker-custom/in-v1alpha2.yaml @@ -36,9 +36,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index 3f4c1ec0b0e6e..bf95be1de0467 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -223,5 +223,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml index 653e08ea13ebb..5ccbad24cd9a3 100644 --- a/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index ef095411d1450..45f2d23e4d6e5 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -226,5 +226,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml index cc93aaee1bf98..373801210e049 100644 --- a/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml @@ -40,9 +40,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index 5b2cce7039042..be53f30c164ac 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -207,5 +207,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml b/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml index 7cb1859d0f783..c4604d1ebff86 100644 --- a/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/external_dns/in-v1alpha2.yaml @@ -31,9 +31,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index 6610cb5dde3c5..733d62faf977e 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -211,5 +211,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml index 9e484801fa829..fb979744bf75a 100644 --- a/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/external_dns_irsa/in-v1alpha2.yaml @@ -35,9 +35,6 @@ spec: enableAWSOIDCProvider: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index bd014adf6e386..cfcd628de8839 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -207,5 +207,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/externallb/in-v1alpha2.yaml b/tests/integration/update_cluster/externallb/in-v1alpha2.yaml index f3e085d4a5a0c..fc3cee67b68b4 100644 --- a/tests/integration/update_cluster/externallb/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/externallb/in-v1alpha2.yaml @@ -29,9 +29,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index 02c81a2cafabc..3d084530fdb70 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -227,5 +227,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml b/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml index 9b7e8e6382805..dbef9b48fd4a4 100644 --- a/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/externalpolicies/in-v1alpha2.yaml @@ -44,9 +44,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public externalPolicies: node: - arn:aws-test:iam::123456789000:policy/test-policy diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index ae5964c7b8c09..6dedede18a556 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -223,5 +223,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/ha/in-v1alpha2.yaml b/tests/integration/update_cluster/ha/in-v1alpha2.yaml index dfa4d7b8df79c..28dee205504b9 100644 --- a/tests/integration/update_cluster/ha/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/ha/in-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content index 33359fe13cdc6..23decfc6c86a1 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -209,5 +209,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml b/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml index f08c7ae724a99..60bb815388f43 100644 --- a/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml @@ -56,8 +56,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 023b60f8db778..5a7a665425006 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -243,5 +243,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/irsa/in-v1alpha2.yaml index ed60a26ec8747..fd97f6f917e04 100644 --- a/tests/integration/update_cluster/irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/irsa/in-v1alpha2.yaml @@ -65,9 +65,6 @@ spec: - sts.amazonaws.com sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index 6e99b9a23c8cc..484185bf88afc 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -216,5 +216,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml b/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml index a5219c3276a40..9c9314f1a4375 100644 --- a/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/karpenter/in-v1alpha2.yaml @@ -35,9 +35,6 @@ spec: discoveryStore: memfs://discovery.example.com/minimal.example.com sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml b/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml index 98da98a51735c..b8654412ea96f 100644 --- a/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml @@ -29,9 +29,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index af04af3b373c4..dbfc1a7d53494 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -247,5 +247,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml index 9c054b242f744..12f1aef985a38 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml @@ -50,9 +50,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content index 766b6a2d08a6c..10dd3d25272da 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content @@ -249,5 +249,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml index c40a0daca032a..95df429465b11 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/in-v1alpha2.yaml @@ -50,9 +50,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index 9f49d27d8e70b..6f544bf8c19e9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -248,5 +248,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml index 9251278034539..8e6fdfcdad9ed 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/in-v1alpha2.yaml @@ -50,9 +50,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index 5ce0aec937479..5370dff1d85b3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -247,5 +247,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml index f3fc89fe33d2b..9bf4e51b4bc13 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/in-v1alpha2.yaml @@ -50,9 +50,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 1c3a73dbf959a..e3f843fa74195 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -254,5 +254,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml index 0f9382ed86ae2..2f972f4af56cc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/in-v1alpha2.yaml @@ -58,9 +58,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index 10261cf193171..17e9c913b5a5c 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -243,5 +243,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml index ccb6b82f19762..69ee42bddceed 100644 --- a/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml @@ -47,9 +47,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content index 14d6b1c5fe885..ee3777b5d20e1 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -222,5 +222,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons-gce/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons-gce/in-v1alpha2.yaml index acf8216b82bc1..6e3e3938a6ba0 100644 --- a/tests/integration/update_cluster/many-addons-gce/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons-gce/in-v1alpha2.yaml @@ -55,8 +55,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 23144a1c9989c..3e2fca294e1ca 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -244,5 +244,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml index 38352bf2a3d16..b15e3459b5441 100644 --- a/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml @@ -46,9 +46,6 @@ spec: enabled: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content index f5122f572e844..573a1e705c0a6 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content @@ -211,5 +211,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-1.23/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.23/in-v1alpha2.yaml index 6540a05fd6a52..1290dbc1b57a4 100644 --- a/tests/integration/update_cluster/minimal-1.23/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.23/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index 4cc9f1b026b2f..a2473c4384162 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -217,5 +217,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-1.24/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.24/in-v1alpha2.yaml index 18ea851b37833..e60433b24c0eb 100644 --- a/tests/integration/update_cluster/minimal-1.24/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.24/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index 2b7c558418b91..22c64c944f8a0 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -216,5 +216,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml index a240aa0a98eae..419493e194aea 100644 --- a/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.25/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index a547a66d1930c..146f7966f5d50 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -216,5 +216,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml index c7c88a2a2fc95..00ea190731ae6 100644 --- a/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.26/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content index 4cc720093eabf..5d6485764c4f9 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content @@ -211,5 +211,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-1.27/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-1.27/in-v1alpha2.yaml index 092279b79b9e4..f6a5263a58d79 100644 --- a/tests/integration/update_cluster/minimal-1.27/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-1.27/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index b0150157587fe..bdd0f7d533e98 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -215,5 +215,3 @@ spec: topology: dns: type: None - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml index 0309037be576b..1437d6a3123d4 100644 --- a/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-dns-none/in-v1alpha2.yaml @@ -53,8 +53,6 @@ spec: topology: dns: type: None - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content index 84b38abfc2655..9786da577a3c5 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content @@ -215,5 +215,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml index e160012a08dc0..d68f5ac0e74dd 100644 --- a/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml @@ -41,9 +41,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index 01a3f36342d42..679ebf9fa2ede 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -213,5 +213,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml index 6c7c92dc5888e..fb85ec6349af3 100644 --- a/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-gp3/in-v1alpha2.yaml @@ -35,9 +35,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index 658e6e5c79077..fa23a7a7ad1fd 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -241,5 +241,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml index 441316511954f..10629e1613067 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-calico/in-v1alpha2.yaml @@ -68,9 +68,6 @@ spec: name: utility-us-test-1b type: Utility zone: us-test-1b - topology: - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index 19756fc2e3280..130cce38e0250 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content @@ -269,5 +269,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml index f96e3a63a78cc..87d1346f807b4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/in-v1alpha2.yaml @@ -68,9 +68,6 @@ spec: name: utility-us-test-1b type: Utility zone: us-test-1b - topology: - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content index f6d0a73a56502..168ecec186e27 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content @@ -240,5 +240,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/in-v1alpha2.yaml index 6ae8e2bd91858..63907988c751b 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/in-v1alpha2.yaml @@ -68,9 +68,6 @@ spec: name: utility-us-test-1b type: Utility zone: us-test-1b - topology: - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index 80a80bbd4de40..ab59d0610a3d3 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -240,5 +240,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml index 5a8295c4f459d..fea43fa0642a7 100644 --- a/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/in-v1alpha2.yaml @@ -68,9 +68,6 @@ spec: name: utility-us-test-1b type: Utility zone: us-test-1b - topology: - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index a22766d26d59c..0f71e62f4ce6b 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -203,5 +203,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml index 4e01370232e56..41cde758a2107 100644 --- a/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-longclustername/in-v1alpha2.yaml @@ -26,9 +26,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 88e0c511bd431..12eceb0840680 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content @@ -236,8 +236,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public warmPool: enableLifecycleHook: true maxSize: 1 diff --git a/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml index 6827276c90ee5..60d37beba70a7 100644 --- a/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-warmpool/in-v1alpha2.yaml @@ -32,9 +32,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content index 55a86af504c37..eba40f39bd975 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content @@ -198,5 +198,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml index 4dd745a85661a..843a83a567fcd 100644 --- a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml @@ -26,9 +26,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content index 3020440d3adde..15ecf502f5204 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -201,5 +201,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml index a51cb6ad73ae8..4bfd83e367fc8 100644 --- a/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml @@ -48,8 +48,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content index 6e1844bda1a98..90fc4f4bf87ac 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -202,5 +202,3 @@ spec: topology: dns: type: None - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce_dns-none/in-v1alpha2.yaml index 67c3bd275a302..1a944aa628c4f 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce_dns-none/in-v1alpha2.yaml @@ -51,8 +51,6 @@ spec: topology: dns: type: None - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content index 04f6150d66cc2..47bff956e2c21 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -205,5 +205,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal_gce_ilb/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce_ilb/in-v1alpha2.yaml index 43cdd023561c6..9ffd64e5475fb 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce_ilb/in-v1alpha2.yaml @@ -52,8 +52,6 @@ spec: topology: dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content index d69b8c49eeb1b..c2bddef44f76d 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -205,5 +205,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/in-v1alpha2.yaml index f8a41353134f9..4fdde168395d1 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/in-v1alpha2.yaml @@ -52,8 +52,6 @@ spec: topology: dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content index d928b357d5a4c..0acdf2c9e5fa4 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -201,5 +201,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce_longclustername/in-v1alpha2.yaml index 68b62576c351a..78f3de166654f 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce_longclustername/in-v1alpha2.yaml @@ -48,8 +48,6 @@ spec: topology: dns: type: Public - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content index c04564fce5e77..406234285f90c 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content @@ -205,5 +205,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal_gce_plb/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce_plb/in-v1alpha2.yaml index b56f783365597..f8af5860d100d 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce_plb/in-v1alpha2.yaml @@ -52,8 +52,6 @@ spec: topology: dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content index dd995d6af47c6..79d9d274e284e 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -201,5 +201,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/minimal_gce_private/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce_private/in-v1alpha2.yaml index 3226a18363301..3a237f28f30bf 100644 --- a/tests/integration/update_cluster/minimal_gce_private/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce_private/in-v1alpha2.yaml @@ -48,8 +48,6 @@ spec: topology: dns: type: Public - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index fa1db50b92c7f..38d65a555130e 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -206,5 +206,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml index 96a22375ea8d5..8a5eb8b441e19 100644 --- a/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gossip/in-v1alpha2.yaml @@ -29,9 +29,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 066c045d46dd6..4a59664c7f685 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -210,5 +210,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml index 2e6e6317eaa1b..859b4b84b6193 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gossip_irsa/in-v1alpha2.yaml @@ -33,9 +33,6 @@ spec: enableAWSOIDCProvider: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content index badebafb044ab..8d3a232ed503b 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content @@ -193,5 +193,3 @@ spec: topology: dns: type: None - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal_hetzner/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_hetzner/in-v1alpha2.yaml index f8669c8902ee3..6805f2d3b84e2 100644 --- a/tests/integration/update_cluster/minimal_hetzner/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_hetzner/in-v1alpha2.yaml @@ -48,8 +48,6 @@ spec: topology: dns: type: None - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/minimal_openstack/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_openstack/in-v1alpha2.yaml index ab305cf362ece..0ca2331f4a06b 100644 --- a/tests/integration/update_cluster/minimal_openstack/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_openstack/in-v1alpha2.yaml @@ -44,8 +44,6 @@ spec: topology: dns: type: Private - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content index d308da465134b..7a491db9c0119 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content @@ -216,5 +216,3 @@ spec: topology: dns: type: Private - masters: public - nodes: public diff --git a/tests/integration/update_cluster/minimal_scaleway/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_scaleway/in-v1alpha2.yaml index f41e43e4e1428..b88f6a364fd99 100644 --- a/tests/integration/update_cluster/minimal_scaleway/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_scaleway/in-v1alpha2.yaml @@ -50,8 +50,6 @@ spec: topology: dns: type: Private - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index 2888b52f6cee4..7c4348738d630 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -223,5 +223,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml b/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml index 5cf655928b8b8..776199af0561a 100644 --- a/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml @@ -37,9 +37,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 10.0.1.0/24 name: us-test-1a diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index 2888b52f6cee4..7c4348738d630 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -223,5 +223,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml b/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml index 9ddc5e9c7dcc7..d55cdda2ab11f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml @@ -37,9 +37,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 10.0.1.0/24 name: us-test-1a diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content index 1662bb7703c57..bd0f7d7e531aa 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -224,5 +224,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/nth-imds-processor-irsa/in-v1alpha2.yaml index 8c8db393ccf2b..b3fcc0d678cdb 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/in-v1alpha2.yaml @@ -36,9 +36,6 @@ spec: enableSQSTerminationDraining: false sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content index e0a287b7471b0..d1c2d46b84bb3 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content @@ -220,5 +220,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/nth-imds-processor/in-v1alpha2.yaml b/tests/integration/update_cluster/nth-imds-processor/in-v1alpha2.yaml index 2764654e34949..e4deafebac371 100644 --- a/tests/integration/update_cluster/nth-imds-processor/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/nth-imds-processor/in-v1alpha2.yaml @@ -32,9 +32,6 @@ spec: enableSQSTerminationDraining: false sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index 8fbf24a5af8cd..e823e287a9035 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -210,5 +210,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml b/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml index 938d8df3bbefe..1580944aa5dcd 100644 --- a/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/nvidia/in-v1alpha2.yaml @@ -33,9 +33,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/openstack_floatingip/in-v1alpha2.yaml b/tests/integration/update_cluster/openstack_floatingip/in-v1alpha2.yaml index cc57e190974c5..fc948995bccfe 100644 --- a/tests/integration/update_cluster/openstack_floatingip/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/openstack_floatingip/in-v1alpha2.yaml @@ -49,8 +49,6 @@ spec: topology: dns: type: Private - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index b9e0e19ba185c..9e751fe22c180 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -215,5 +215,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml b/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml index 10cca19d62137..eff4a9c32350a 100644 --- a/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/private-shared-ip/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index 50ff333b83c64..51e25dbfc628b 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -217,5 +217,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml b/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml index 7d53e6753556b..68c70b4b3204b 100644 --- a/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 id: subnet-12345678 diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index d29a67830ccb6..e461730acea5f 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -217,5 +217,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml index 8b970519ae8f7..2548821f47307 100644 --- a/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml @@ -46,9 +46,6 @@ spec: name: utility-us-test-1a type: Utility zone: us-test-1a - topology: - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index 250d4ccaf5589..47e1802832c52 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -213,5 +213,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml index 54c3f347327cd..3c972c30999c8 100644 --- a/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml @@ -29,9 +29,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content index 73f33d1879781..cb97b4dcfbcbc 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content @@ -242,5 +242,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatecilium-eni/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecilium-eni/in-v1alpha2.yaml index a7bd8ba5f32f9..ca9ed82b01d79 100644 --- a/tests/integration/update_cluster/privatecilium-eni/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecilium-eni/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index e33caefa11b74..893c39073c4fb 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -250,5 +250,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml index 52681f71cc409..8e98b5659e036 100644 --- a/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecilium/in-v1alpha2.yaml @@ -37,9 +37,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index f37fc29fb181e..2b76e1de0d316 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -245,5 +245,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml index 250a68a44afd2..71280f14cfe3c 100644 --- a/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml @@ -33,9 +33,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index f49483f64f47e..ec00849865caf 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -254,5 +254,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml b/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml index 11fc871dc6bd6..4fc18ad14d5fb 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/in-v1alpha2.yaml @@ -39,9 +39,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 84b8dacbc7a8a..e096b1084d9cf 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -211,5 +211,3 @@ spec: topology: dns: type: Private - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml index 2676338eb1584..0353d48d6330e 100644 --- a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml @@ -36,8 +36,6 @@ spec: topology: dns: type: Private - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index 7568e23761586..3cf67e7614f24 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -214,5 +214,3 @@ spec: topology: dns: type: Private - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml index 28d79dc9ef076..4860eb80a5986 100644 --- a/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml @@ -34,8 +34,6 @@ spec: topology: dns: type: Private - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index 6126c9c900cca..31fd279e96964 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -214,5 +214,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml index 7157a54b24105..50325c97838c9 100644 --- a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index 74e67d325c3cd..eddf5a4bf3c3b 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -223,5 +223,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml b/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml index 4666a8e1bebf8..256a47b51d699 100644 --- a/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml @@ -29,9 +29,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.64.0/19 name: us-test-1b diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index daf59aab325a7..db39502e6eded 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -213,5 +213,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml b/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml index 5b6965626adbf..8d556b7d59418 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/public-jwks-apiserver/in-v1alpha2.yaml @@ -36,9 +36,6 @@ spec: enableAWSOIDCProvider: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index 459acd08c2650..21310bc8ad841 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -209,5 +209,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml index 53de34cfb95a1..7b6994c3c7d05 100644 --- a/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml @@ -36,9 +36,6 @@ spec: name: us-test-1a type: Public zone: us-test-1a - topology: - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index d9cf87b281b4c..262154ae9a004 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -208,5 +208,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml index 368b8e115d09c..0cbb5be206879 100644 --- a/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml @@ -35,9 +35,6 @@ spec: name: us-test-1a type: Public zone: us-test-1a - topology: - masters: public - nodes: public --- diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content index 8f05f90f3d0c0..209e86af1b832 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -241,5 +241,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_vpc_ipv6/in-v1alpha2.yaml index 20b6369984d07..954403d60335a 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_vpc_ipv6/in-v1alpha2.yaml @@ -69,9 +69,6 @@ spec: name: utility-us-test-1b type: Utility zone: us-test-1b - topology: - masters: private - nodes: private --- diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index 2da432e627684..d439a6f4643fb 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -226,5 +226,3 @@ spec: topology: dns: type: Public - masters: private - nodes: private diff --git a/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml b/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml index d0804a8c0ef07..83ab534eef8f3 100644 --- a/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/unmanaged/in-v1alpha2.yaml @@ -30,9 +30,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: private - nodes: private subnets: - cidr: 172.20.32.0/19 egress: External diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index 6d84435e548e0..259f42698960f 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -210,5 +210,3 @@ spec: topology: dns: type: Public - masters: public - nodes: public diff --git a/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml b/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml index 37d83c652fcba..0a11d4640dadb 100644 --- a/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/vfs-said/in-v1alpha2.yaml @@ -32,9 +32,6 @@ spec: enableAWSOIDCProvider: true sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/defaults.go b/upup/pkg/fi/cloudup/defaults.go index a4e36b997126b..ca3f8e7f63b23 100644 --- a/upup/pkg/fi/cloudup/defaults.go +++ b/upup/pkg/fi/cloudup/defaults.go @@ -56,7 +56,7 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl // Topology support // TODO Kris: Unsure if this needs to be here, or if the API conversion code will handle it if c.Spec.Networking.Topology == nil { - c.Spec.Networking.Topology = &kops.TopologySpec{ControlPlane: kops.TopologyPublic, Nodes: kops.TopologyPublic} + c.Spec.Networking.Topology = &kops.TopologySpec{} } if cloud == nil { diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go index 6c5435d41fba9..bf4e1ef090246 100644 --- a/upup/pkg/fi/cloudup/new_cluster.go +++ b/upup/pkg/fi/cloudup/new_cluster.go @@ -1163,12 +1163,9 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S } } + cluster.Spec.Networking.Topology = &api.TopologySpec{} switch opt.Topology { case api.TopologyPublic: - cluster.Spec.Networking.Topology = &api.TopologySpec{ - ControlPlane: api.TopologyPublic, - Nodes: api.TopologyPublic, - } if opt.Bastion { return nil, fmt.Errorf("bastion supports --topology='private' only") @@ -1182,10 +1179,6 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S if cluster.Spec.Networking.Kubenet != nil { return nil, fmt.Errorf("invalid networking option %s. Kubenet does not support private topology", opt.Networking) } - cluster.Spec.Networking.Topology = &api.TopologySpec{ - ControlPlane: api.TopologyPrivate, - Nodes: api.TopologyPrivate, - } for i := range cluster.Spec.Networking.Subnets { cluster.Spec.Networking.Subnets[i].Type = api.SubnetTypePrivate @@ -1348,7 +1341,7 @@ func setupAPI(opt *NewClusterOptions, cluster *api.Cluster) error { if opt.APILoadBalancerType != "" || opt.APISSLCertificate != "" { cluster.Spec.API.LoadBalancer = &api.LoadBalancerAccessSpec{} } else { - switch cluster.Spec.Networking.Topology.ControlPlane { + switch opt.Topology { case api.TopologyPublic: if cluster.UsesLegacyGossip() || cluster.UsesNoneDNS() { // gossip DNS names don't work outside the cluster, so we use a LoadBalancer instead @@ -1361,7 +1354,7 @@ func setupAPI(opt *NewClusterOptions, cluster *api.Cluster) error { cluster.Spec.API.LoadBalancer = &api.LoadBalancerAccessSpec{} default: - return fmt.Errorf("unknown control-plane topology type: %q", cluster.Spec.Networking.Topology.ControlPlane) + return fmt.Errorf("unknown topology type: %q", opt.Topology) } } diff --git a/upup/pkg/fi/cloudup/populate_cluster_spec_test.go b/upup/pkg/fi/cloudup/populate_cluster_spec_test.go index 39d7648f636dc..a11f870183dc4 100644 --- a/upup/pkg/fi/cloudup/populate_cluster_spec_test.go +++ b/upup/pkg/fi/cloudup/populate_cluster_spec_test.go @@ -324,37 +324,6 @@ func TestPopulateCluster_CloudProvider_Required(t *testing.T) { expectErrorFromPopulateCluster(t, c, cloud, "cloudProvider") } -func TestPopulateCluster_TopologyInvalidNil_Required(t *testing.T) { - cloud, c := buildMinimalCluster() - c.Spec.Networking.Topology.ControlPlane = "" - c.Spec.Networking.Topology.Nodes = "" - expectErrorFromPopulateCluster(t, c, cloud, "topology") -} - -func TestPopulateCluster_TopologyInvalidValue_Required(t *testing.T) { - cloud, c := buildMinimalCluster() - c.Spec.Networking.Topology.ControlPlane = "123" - c.Spec.Networking.Topology.Nodes = "abc" - expectErrorFromPopulateCluster(t, c, cloud, "topology") -} - -//func TestPopulateCluster_TopologyInvalidMatchingValues_Required(t *testing.T) { -// // We can't have a bastion with public masters / nodes -// c := buildMinimalCluster() -// c.Spec.Topology.ControlPlane = api.TopologyPublic -// c.Spec.Topology.Nodes = api.TopologyPrivate -// expectErrorFromPopulateCluster(t, c, "Topology") -//} - -func TestPopulateCluster_BastionInvalidMatchingValues_Required(t *testing.T) { - // We can't have a bastion with public masters / nodes - cloud, c := buildMinimalCluster() - c.Spec.Networking.Topology.ControlPlane = kopsapi.TopologyPublic - c.Spec.Networking.Topology.Nodes = kopsapi.TopologyPublic - c.Spec.Networking.Topology.Bastion = &kopsapi.BastionSpec{} - expectErrorFromPopulateCluster(t, c, cloud, "bastion") -} - func expectErrorFromPopulateCluster(t *testing.T, c *kopsapi.Cluster, cloud fi.Cloud, message string) { ctx := context.TODO() _, err := mockedPopulateClusterSpec(ctx, c, cloud) diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml index a90c2867aea8a..f905805a30d8b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml @@ -37,9 +37,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml index 3ae863823544b..a554ee77eba19 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml @@ -36,9 +36,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml index 9b97b2c37cc0e..24ee57085c05e 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml @@ -36,9 +36,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml index 4397dfffe6105..4a834f707a407 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml @@ -35,9 +35,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml index 90c938a9695a1..42aa1c74c33c8 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml @@ -39,9 +39,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml index c88f34621a463..2bd8940196b12 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml @@ -31,9 +31,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml index 0ae9bf2f796cd..fd9e65c31c1d3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml @@ -53,9 +53,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml index 8f5d90b24b6ec..1759548ff9075 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml @@ -34,9 +34,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml index a59d23becebd3..5c0f3c06200d7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml @@ -36,9 +36,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml index 5807ac5b4f76f..f053b8e4d7858 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml @@ -34,9 +34,6 @@ spec: discoveryStore: memfs://discovery.example.com/minimal.example.com sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml index 295c5e9646360..9f7446f5b3409 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml @@ -31,9 +31,6 @@ spec: nonMasqueradeCIDR: 100.64.0.0/10 sshAccess: - 0.0.0.0/0 - topology: - masters: public - nodes: public subnets: - cidr: 172.20.32.0/19 name: us-test-1a From d57df6d0642e3c4787084b3455d4f50dfa419895 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Wed, 19 Jul 2023 08:54:47 -0700 Subject: [PATCH 2/2] v1alpha3: Remove no-longer-used topology fields --- pkg/apis/kops/topology.go | 6 ------ pkg/apis/kops/v1alpha2/topology.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 6 ++---- pkg/apis/kops/v1alpha3/topology.go | 6 ------ pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 4 ---- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/pkg/apis/kops/topology.go b/pkg/apis/kops/topology.go index a1870e2966ce4..22321175dacd9 100644 --- a/pkg/apis/kops/topology.go +++ b/pkg/apis/kops/topology.go @@ -33,12 +33,6 @@ var SupportedDnsTypes = []DNSType{ } type TopologySpec struct { - // ControlPlane is not used. - ControlPlane string `json:"controlPlane,omitempty"` - - // Nodes is not used. - Nodes string `json:"nodes,omitempty"` - // Bastion provide an external facing point of entry into a network // containing private network instances. This host can provide a single // point of fortification or audit and can be started and stopped to enable diff --git a/pkg/apis/kops/v1alpha2/topology.go b/pkg/apis/kops/v1alpha2/topology.go index 21f178342567c..87c36df059d20 100644 --- a/pkg/apis/kops/v1alpha2/topology.go +++ b/pkg/apis/kops/v1alpha2/topology.go @@ -23,9 +23,11 @@ const ( type TopologySpec struct { // ControlPlane is not used. + // +k8s:conversion-gen=false ControlPlane string `json:"masters,omitempty"` // Nodes is not used. + // +k8s:conversion-gen=false Nodes string `json:"nodes,omitempty"` // Bastion provide an external facing point of entry into a network diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index e5c8b418faecd..0c1369df164c2 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -7161,8 +7161,8 @@ func Convert_kops_TerraformSpec_To_v1alpha2_TerraformSpec(in *kops.TerraformSpec } func autoConvert_v1alpha2_TopologySpec_To_kops_TopologySpec(in *TopologySpec, out *kops.TopologySpec, s conversion.Scope) error { - out.ControlPlane = in.ControlPlane - out.Nodes = in.Nodes + // INFO: in.ControlPlane opted out of conversion generation + // INFO: in.Nodes opted out of conversion generation if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(kops.BastionSpec) @@ -7178,8 +7178,6 @@ func autoConvert_v1alpha2_TopologySpec_To_kops_TopologySpec(in *TopologySpec, ou } func autoConvert_kops_TopologySpec_To_v1alpha2_TopologySpec(in *kops.TopologySpec, out *TopologySpec, s conversion.Scope) error { - out.ControlPlane = in.ControlPlane - out.Nodes = in.Nodes if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(BastionSpec) diff --git a/pkg/apis/kops/v1alpha3/topology.go b/pkg/apis/kops/v1alpha3/topology.go index 9925713a3e7ca..5560dd81c9fb3 100644 --- a/pkg/apis/kops/v1alpha3/topology.go +++ b/pkg/apis/kops/v1alpha3/topology.go @@ -22,12 +22,6 @@ const ( ) type TopologySpec struct { - // ControlPlane is not used. - ControlPlane string `json:"controlPlane,omitempty"` - - // Nodes is not used. - Nodes string `json:"nodes,omitempty"` - // Bastion provide an external facing point of entry into a network // containing private network instances. This host can provide a single // point of fortification or audit and can be started and stopped to enable diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 4f5b03a400cbe..b59594816bfc5 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -7408,8 +7408,6 @@ func Convert_kops_TerraformSpec_To_v1alpha3_TerraformSpec(in *kops.TerraformSpec } func autoConvert_v1alpha3_TopologySpec_To_kops_TopologySpec(in *TopologySpec, out *kops.TopologySpec, s conversion.Scope) error { - out.ControlPlane = in.ControlPlane - out.Nodes = in.Nodes if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(kops.BastionSpec) @@ -7429,8 +7427,6 @@ func Convert_v1alpha3_TopologySpec_To_kops_TopologySpec(in *TopologySpec, out *k } func autoConvert_kops_TopologySpec_To_v1alpha3_TopologySpec(in *kops.TopologySpec, out *TopologySpec, s conversion.Scope) error { - out.ControlPlane = in.ControlPlane - out.Nodes = in.Nodes if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(BastionSpec)