Remove clusterctl alpha topology plan + Cleanup Cluster topology

controller

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

.golangci.yml

@@ -231,7 +231,7 @@ linters:
     # should be removed as the referenced deprecated item is removed from the project.
       - linters:
           - staticcheck
-        text: 'SA1019: (bootstrapv1.ClusterStatus|DockerMachine.Spec.Bootstrapped|machineStatus.Bootstrapped|dockerMachine.Spec.Backend.Docker.Bootstrapped|dockerMachine.Spec.Bootstrapped|devMachine.Spec.Backend.Docker.Bootstrapped|c.TopologyPlan|clusterv1.ClusterClassVariableMetadata|clusterv1beta1.ClusterClassVariableMetadata|(variable|currentDefinition|specVar|newVariableDefinition|statusVarDefinition|out).DeprecatedV1Beta1Metadata) is deprecated'
+        text: 'SA1019: (bootstrapv1.ClusterStatus|DockerMachine.Spec.Bootstrapped|machineStatus.Bootstrapped|dockerMachine.Spec.Backend.Docker.Bootstrapped|dockerMachine.Spec.Bootstrapped|devMachine.Spec.Backend.Docker.Bootstrapped|clusterv1.ClusterClassVariableMetadata|clusterv1beta1.ClusterClassVariableMetadata|(variable|currentDefinition|specVar|newVariableDefinition|statusVarDefinition|out).DeprecatedV1Beta1Metadata) is deprecated'
         # Deprecations for MHC MaxUnhealthy, UnhealthyRange
       - linters:
           - staticcheck

cmd/clusterctl/client/client.go

@@ -87,10 +87,6 @@ type AlphaClient interface {
 	RolloutPause(ctx context.Context, options RolloutPauseOptions) error
 	// RolloutResume provides rollout resume of paused cluster-api resources
 	RolloutResume(ctx context.Context, options RolloutResumeOptions) error
-	// TopologyPlan dry runs the topology reconciler
-	//
-	// Deprecated: TopologyPlan is deprecated and will be removed in one of the upcoming releases.
-	TopologyPlan(ctx context.Context, options TopologyPlanOptions) (*TopologyPlanOutput, error)
 }
 
 // YamlPrinter exposes methods that prints the processed template and

cmd/clusterctl/client/client_test.go

@@ -145,10 +145,6 @@ func (f fakeClient) RolloutResume(ctx context.Context, options RolloutResumeOpti
 	return f.internalClient.RolloutResume(ctx, options)
 }
 
-func (f fakeClient) TopologyPlan(ctx context.Context, options TopologyPlanOptions) (*cluster.TopologyPlanOutput, error) {
-	return f.internalClient.TopologyPlan(ctx, options)
-}
-
 // newFakeClient returns a clusterctl client that allows to execute tests on a set of fake config, fake repositories and fake clusters.
 // you can use WithCluster and WithRepository to prepare for the test case.
 func newFakeClient(ctx context.Context, configClient config.Client) *fakeClient {
@@ -322,10 +318,6 @@ func (f *fakeClusterClient) WorkloadCluster() cluster.WorkloadCluster {
 	return f.internalclient.WorkloadCluster()
 }
 
-func (f *fakeClusterClient) Topology() cluster.TopologyClient {
-	return f.internalclient.Topology()
-}
-
 func (f *fakeClusterClient) WithObjs(objs ...client.Object) *fakeClusterClient {
 	f.fakeProxy.WithObjs(objs...)
 	return f

cmd/clusterctl/client/cluster/client.go

@@ -81,9 +81,6 @@ type Client interface {
 
 	// WorkloadCluster has methods for fetching kubeconfig of workload cluster from management cluster.
 	WorkloadCluster() WorkloadCluster
-
-	// Topology returns a TopologyClient that can be used for performing dry run executions of the topology reconciler.
-	Topology() TopologyClient
 }
 
 // PollImmediateWaiter tries a condition func until it returns true, an error, or the timeout is reached.
@@ -147,10 +144,6 @@ func (c *clusterClient) WorkloadCluster() WorkloadCluster {
 	return newWorkloadCluster(c.proxy)
 }
 
-func (c *clusterClient) Topology() TopologyClient {
-	return newTopologyClient(c.proxy, c.ProviderInventory())
-}
-
 // Option is a configuration option supplied to New.
 type Option func(*clusterClient)