Skip to content

Commit f072182

Browse files
authored
Merge pull request #5954 from sbueringer/pr-cc-doc
📖 ClusterClass: restructure documentation
2 parents 0f806f7 + 1e458b5 commit f072182

File tree

6 files changed

+18
-116
lines changed

6 files changed

+18
-116
lines changed

docs/book/src/SUMMARY.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
- [ClusterResourceSet](./tasks/experimental-features/cluster-resource-set.md)
2121
- [ClusterClass](./tasks/experimental-features/cluster-class/index.md)
2222
- [Writing a ClusterClass](./tasks/experimental-features/cluster-class/write-clusterclass.md)
23-
- [Upgrading a Cluster](./tasks/experimental-features/cluster-class/upgrade-cluster.md)
2423
- [Changing a ClusterClass](./tasks/experimental-features/cluster-class/change-clusterclass.md)
24+
- [Operating a managed Cluster](./tasks/experimental-features/cluster-class/operate-cluster.md)
2525
- [Ignition Bootstrap configuration](./tasks/experimental-features/ignition.md)
2626
- [clusterctl CLI](./clusterctl/overview.md)
2727
- [clusterctl Commands](clusterctl/commands/commands.md)
@@ -34,6 +34,8 @@
3434
- [upgrade](clusterctl/commands/upgrade.md)
3535
- [delete](clusterctl/commands/delete.md)
3636
- [completion](clusterctl/commands/completion.md)
37+
- [alpha rollout](clusterctl/commands/alpha-rollout.md)
38+
- [alpha topology plan](clusterctl/commands/alpha-topology-plan.md)
3739
- [clusterctl Configuration](clusterctl/configuration.md)
3840
- [clusterctl Provider Contract](clusterctl/provider-contract.md)
3941
- [clusterctl for Developers](clusterctl/developers.md)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# clusterctl alpha topology plan
2+
3+
**Under Construction**

docs/book/src/clusterctl/commands/commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
* [`clusterctl delete`](delete.md)
1111
* [`clusterctl completion`](completion.md)
1212
* [`clusterctl alpha rollout`](alpha-rollout.md)
13-
* [`clusterctl config cluster` (deprecated)](config-cluster.md)
13+
* [`clusterctl alpha topology plan`](alpha-topology-plan.md)

docs/book/src/clusterctl/commands/config-cluster.md

Lines changed: 0 additions & 107 deletions
This file was deleted.

docs/book/src/tasks/experimental-features/cluster-class/index.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ ClusterClass is a powerful abstraction implemented on top of existing interfaces
88
**Variable name to enable/disable the feature gate**: `CLUSTER_TOPOLOGY`
99

1010
Additional documentation:
11+
* Background information: [ClusterClass and Managed Topologies CAEP](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/202105256-cluster-class-and-managed-topologies.md)
1112
* For ClusterClass authors:
12-
* [Writing a ClusterClass](./write-clusterclass.md)
13-
* Publishing a ClusterClass is documented in the [clusterctl Provider contract]
14-
* For Cluster operators:
15-
* Creating a Cluster is documented in the [Quick Start guide]
16-
* [Upgrading a Cluster](./upgrade-cluster.md)
13+
* [Writing a ClusterClass](./write-clusterclass.md)
1714
* [Changing a ClusterClass](./change-clusterclass.md)
18-
* Additional background information can be found in the [ClusterClass and Managed Topologies CAEP](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/202105256-cluster-class-and-managed-topologies.md)
15+
* Publishing a ClusterClass for clusterctl usage: [clusterctl Provider contract]
16+
* For Cluster operators:
17+
* Creating a Cluster: [Quick Start guide]
18+
* [Operating a managed Cluster](./operate-cluster.md)
19+
* Planning topology rollouts: [clusterctl alpha topology plan]
1920

2021
<!-- links -->
2122
[Quick Start guide]: ../../../user/quick-start.md
2223
[clusterctl Provider contract]: ../../../clusterctl/provider-contract.md
24+
[clusterctl alpha topology plan]: ../../../clusterctl/commands/alpha-topology-plan.md

docs/book/src/tasks/experimental-features/cluster-class/upgrade-cluster.md renamed to docs/book/src/tasks/experimental-features/cluster-class/operate-cluster.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Upgrade a Cluster using Managed Topology
1+
# Operating a managed Cluster
2+
3+
## Upgrade the Cluster
24

35
The `spec.topology` field added to the Cluster object as part of ClusterClass allows changes made on the Cluster to be propagated across all relevant objects. This turns a Kubernetes cluster upgrade into a one-touch operation.
46
Let's assume we have created a CAPD cluster with ClusterClass and Kubernetes v1.21.2 (as documented in the [Quick Start guide]). Looking at the cluster, the version of the control plane and the MachineDeployments is v1.21.2.

0 commit comments

Comments
 (0)