Skip to content

Commit d5f1495

Browse files
authored
docs: Clarified docs for creating new clusters when using templates. (#26)
1 parent 3c1c87e commit d5f1495

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

docs/src/gs/create-workload-cluster.md

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Workload Cluster Templates
44

5-
The workload cluster templates can be downloaded from the [latest released artifacts][latest-release].
5+
Choose one of the available templates for to create your workload clusters from the [latest released artifacts][latest-release]. Each workload cluster template can be further configured with the parameters below.
66

77
## Workload Cluster Parameters
88

@@ -31,7 +31,7 @@ The following Cluster API parameters are also available:
3131
| `SERVICE_DOMAIN` | | |
3232
| `WORKER_MACHINE_COUNT` | | The number of worker machines for the workload cluster. |
3333

34-
## Using an Ubuntu custom image on virtual instances
34+
## Create a new workload cluster on virtual instances using an Ubuntu custom image
3535

3636
Run the command below to create a Kubernetes cluster with 1 control plane node and 1 worker node:
3737

@@ -50,7 +50,7 @@ clusterctl generate cluster <cluster-name>\
5050
--from cluster-template.yaml | kubectl apply -f -
5151
```
5252

53-
## Using an Ubuntu custom image on bare metal instances
53+
## Create a new workload cluster on bare metal instances using an Ubuntu custom image
5454

5555
Note the addition of `OCI_PV_TRANSIT_ENCRYPTION=false` which is required for most BM shapes.
5656

@@ -70,7 +70,7 @@ clusterctl generate cluster <cluster-name>\
7070
--from cluster-template.yaml| kubectl apply -f -
7171
```
7272

73-
## Using an Oracle Linux custom image on virtual instances
73+
## Create a new workload cluster on virtual instances using an Oracle Linux custom image
7474

7575
```bash
7676
OCI_COMPARTMENT_ID=<compartment-id> \
@@ -126,28 +126,11 @@ If you have an issue with your alternative CNI provider, please raise an issue o
126126

127127
### Install OCI Cloud Controller Manager and CSI in a self-provisioned cluster
128128

129-
By default, the [OCI Cloud Controller Manager (CCM)][oci-ccm] is not installed into a workload cluster. To install the OCI CCM, run the following command:
130-
131-
<!-- The above templates do not install the OCI CCM and CSI Driver in the workload cluster. The following command can be used
132-
to install CCM and CSI by default in the workload clusters using ClusterResourceSet functionality provided by
133-
Cluster API. -->
134-
135-
```bash
136-
OCI_IMAGE_ID=<ubuntu-custom-image-id> \
137-
OCI_COMPARTMENT_ID=<compartment-id> \
138-
WORKER_MACHINE_COUNT=1 \
139-
OCI_SHAPE=VM.Standard.E4.Flex \
140-
OCI_SHAPE_OCPUS=1 \
141-
OCI_SHAPE_MEMORY_IN_GBS= \
142-
OCI_SSH_KEY=<ssh-key> \
143-
clusterctl generate cluster <cluster-name> --kubernetes-version v1.20.10 \
144-
--target-namespace default \
145-
--control-plane-machine-count=1 \
146-
--from cluster-template-oci-addons.yaml | kubectl apply -f -
147-
```
129+
By default, the [OCI Cloud Controller Manager (CCM)][oci-ccm] is not installed into a workload cluster. To install the OCI CCM, follow [these instructions][install-oci-ccm].
148130

149131
[antrea]: ../networking/antrea.md
150132
[calico]: ../networking/calico.md
151133
[cni]: https://www.cni.dev/
152134
[oci-ccm]: https://github.com/oracle/oci-cloud-controller-manager
153135
[latest-release]: https://github.com/oracle/cluster-api-provider-oci/releases/tag/v0.1.0
136+
[install-oci-ccm]: ./install-oci-ccm.md

0 commit comments

Comments
 (0)