Skip to content

⚠️ Remove clusterctl alpha topology plan #12283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚠️ Remove clusterctl alpha topology plan #12283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 MD revision management
- linters:
- staticcheck
Expand Down
4 changes: 0 additions & 4 deletions cmd/clusterctl/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ type AlphaClient interface {
//
// Deprecated: RolloutUndo is deprecated and will be removed in one of the upcoming releases.
RolloutUndo(ctx context.Context, options RolloutUndoOptions) 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
Expand Down
8 changes: 0 additions & 8 deletions cmd/clusterctl/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,6 @@ func (f fakeClient) RolloutUndo(ctx context.Context, options RolloutUndoOptions)
return f.internalClient.RolloutUndo(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 {
Expand Down Expand Up @@ -326,10 +322,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
Expand Down
7 changes: 0 additions & 7 deletions cmd/clusterctl/client/cluster/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)

Expand Down
Loading