Merge pull request #15676 from johngmyers/topology

v1alpha3: Remove no-longer-used topology fields
kubernetes · Jul 19, 2023 · 59ced8c · 59ced8c
2 parents d9efa71 + d57df6d
commit 59ced8c
Show file tree

Hide file tree

Showing 282 changed files with 18 additions and 753 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -33,12 +33,6 @@ var SupportedDnsTypes = []DNSType{
 }
 
 type TopologySpec struct {
-	// ControlPlane specifies the environment for launching the control plane nodes. (public, private)
-	ControlPlane string `json:"controlPlane,omitempty"`
-
-	// Nodes specifies the environment for launching the worker nodes. (public, private)
-	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/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
@@ -22,10 +22,12 @@ const (
 )
 
 type TopologySpec struct {
-	// The environment to launch the Kubernetes masters in public|private
+	// ControlPlane is not used.
+	// +k8s:conversion-gen=false
 	ControlPlane string `json:"masters,omitempty"`
 
-	// The environment to launch the Kubernetes nodes in public|private
+	// 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
diff --git 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
@@ -22,12 +22,6 @@ const (
 )
 
 type TopologySpec struct {
-	// ControlPlane specifies the environment for launching the control plane nodes. (public, private)
-	ControlPlane string `json:"controlPlane,omitempty"`
-
-	// Nodes specifies the environment for launching the worker nodes. (public, private)
-	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