Skip to content

Commit 5b93524

Browse files
committed
General docs cleanup
Reading through the book for the first time, I took the opportunity to look at it with fresh eyes and find things that were missing or needed an update. This addresses various grammer, spelling, and linking issues found throughout the book. There are some mdlint updates that were included where they were very obvious, but that was not the scope of this effort. If we want to go with full mdlinting, then that should be its own PR and also include a job to make sure it's enforced. Signed-off-by: Sean McGinnis <[email protected]>
1 parent 7a9cc5f commit 5b93524

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+386
-394
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
The `clusterctl completion` command outputs shell completion code for the
44
specified shell (bash or zsh). The shell code must be evaluated to provide
5-
interactive completion of clusterctl commands. This can be done by sourcing it
6-
from the `~/.bash_profile`.
5+
interactive completion of clusterctl commands.
76

87
## Bash
98

@@ -15,9 +14,10 @@ This requires the bash-completion framework.
1514

1615
</aside>
1716

18-
To install it on macOS use Homebrew:
17+
To install `bash-completion` on macOS, use Homebrew:
18+
1919
```
20-
$ brew install bash-completion
20+
brew install bash-completion
2121
```
2222

2323
Once installed, bash_completion must be evaluated. This can be done by adding

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ clusterctl config cluster my-cluster --kubernetes-version v1.16.3 \
4242

4343
### Flavors
4444

45-
The infrastructure provider authors can provide different type of cluster templates, or flavors; use the `--flavor` flag
45+
The infrastructure provider authors can provide different types of cluster templates, or flavors; use the `--flavor` flag
4646
to specify which flavor to use; e.g.
4747

4848
```
@@ -87,9 +87,9 @@ clusterctl config cluster my-cluster --kubernetes-version v1.16.3 \
8787

8888
### Variables
8989

90-
If the selected cluster template expects some environment variables, user should ensure those variables are set in advance.
90+
If the selected cluster template expects some environment variables, the user should ensure those variables are set in advance.
9191

92-
e.g. if the `AWS_CREDENTIALS` variable is expected for a cluster template targeting the `aws` infrastructure, you
92+
E.g. if the `AWS_CREDENTIALS` variable is expected for a cluster template targeting the `aws` infrastructure, you
9393
should ensure the corresponding environment variable to be set before executing `clusterctl config cluster`.
9494

9595
Please refer to the providers documentation for more info about the required variables or use the

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ The operation is designed to prevent accidental deletion of user created objects
88
clusterctl delete --infrastructure aws
99
```
1010

11-
Deletes the AWS infrastructure provider components, while preserving the namespace where the provider components are hosted and
12-
the provider's CRDs.
11+
This command deletes the AWS infrastructure provider components, while preserving
12+
the namespace where the provider components are hosted and the provider's CRDs.
1313

1414
<aside class="note warning">
1515

@@ -19,7 +19,7 @@ If you want to delete the namespace where the provider components are hosted, yo
1919

2020
Be aware that this operation deletes all the object existing in a namespace, not only the provider's components.
2121

22-
</aside>
22+
</aside>
2323

2424
<aside class="note warning">
2525

@@ -28,7 +28,7 @@ Be aware that this operation deletes all the object existing in a namespace, not
2828
If you want to delete the provider's CRDs, and all the components related to CRDs like e.g. the ValidatingWebhookConfiguration etc.,
2929
you can use the `--include-crd` flag.
3030

31-
Be aware that this operation deletes all the object of Kind defined in the provider's CRDs, e.g. when deleting
31+
Be aware that this operation deletes all the objects of Kind's defined in the provider's CRDs, e.g. when deleting
3232
the aws provider, it deletes all the `AWSCluster`, `AWSMachine` etc.
3333

3434
</aside>
@@ -39,12 +39,12 @@ the aws provider, it deletes all the `AWSCluster`, `AWSMachine` etc.
3939

4040
KNOWN BUG:
4141

42-
Deleting an infrastructure component from a namespace _that share
42+
Deleting an infrastructure component from a namespace _that shares
4343
the same prefix_ with other namespaces (e.g. `foo` and `foo-bar`) will result
4444
in erroneous deletion of cluster scoped objects such as `ClusterRole` and
4545
`ClusterRoleBindings` that share the same namespace prefix.
4646

47-
This is true if the prefix before a dash `-` is same. That is, namespaces such
47+
This is true if the prefix before a dash `-` is the same. That is, namespaces such
4848
as `foo` and `foobar` are fine however namespaces such as `foo` and `foo-bar`
4949
are not.
5050

@@ -60,7 +60,7 @@ For example,
6060
clusterctl delete --infrastructure aws --namespace foo
6161
```
6262
63-
ClusterRole and ClusterRoleBindings for both the namespaces are deleted.
63+
`ClusterRole` and `ClusterRoleBindings` for both the namespaces are deleted.
6464
6565
See [issue 3119] for more details.
6666

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# clusterctl describe cluster
22

3-
The `clusterctl describe cluster` command provides an "at glance" view of a Cluster API cluster designed
3+
The `clusterctl describe cluster` command provides an "at a glance" view of a Cluster API cluster designed
44
to help the user in quickly understanding if there are problems and where.
55

66
For example `clusterctl describe cluster capi-quickstart` will provide an output similar to:
77

88
![](../../images/describe-cluster.png)
99

10-
The "at glance" view is based on the idea that clusterctl should avoid to overload the user with information,
10+
The "at a glance" view is based on the idea that clusterctl should avoid overloading the user with information,
1111
but instead surface problems, if any.
1212

1313
In practice, if you look at the `ControlPlane` node, you might notice that the underlying machines

docs/book/src/clusterctl/commands/generate-yaml.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ example, this command can be leveraged in local and CI scripts or for
99
development purposes.
1010

1111
clusterctl ships with a simple yaml processor that performs variable
12-
substitution that takes into account of default values.
12+
substitution that takes into account default values.
1313
Under the hood, clusterctl's yaml processor uses
1414
[drone/envsubst][drone-envsubst] to replace variables and uses the defaults if
1515
necessary.

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ into a management cluster.
66
This document provides more detail on how `clusterctl init` works and on the supported options for customizing your
77
management cluster.
88

9-
## Defining the management cluster
9+
## Defining the management cluster
1010

1111
The `clusterctl init` command accepts in input a list of providers to install.
1212

@@ -15,9 +15,9 @@ The `clusterctl init` command accepts in input a list of providers to install.
1515
<h1> Which providers can I use? </h1>
1616

1717
You can use the `clusterctl config repositories` command to get a list of supported providers and their repository configuration.
18-
18+
1919
If the provider of your choice is missing, you can customize the list of supported providers by using the
20-
[clusterctl configuration](../configuration.md) file.
20+
[clusterctl configuration](../configuration.md) file.
2121

2222
</aside>
2323

@@ -79,15 +79,15 @@ provider name, e.g. `vsphere:v0.7.0-alpha.0`.
7979

8080
#### Target namespace
8181

82-
The `clusterctl init` command by default installs each provider in the default target namespace defined by each provider, e.g. `capi-system` for the Cluster API core provider.
82+
The `clusterctl init` command by default installs each provider in the default target namespace defined by each provider, e.g. `capi-system` for the Cluster API core provider.
8383

8484
See the provider documentation for more details.
8585

8686
<aside class="note">
8787

8888
<h1> Is it possible to change the target namespace ? </h1>
8989

90-
You can specify the target namespace by using the `--target-namespace` flag.
90+
You can specify the target namespace by using the `--target-namespace` flag.
9191

9292
Please, note that the `--target-namespace` flag applies to all the providers to be installed during a `clusterctl init` operation.
9393

@@ -104,7 +104,7 @@ same target namespace.
104104

105105
#### Watching namespace
106106

107-
The `clusterctl init` command by default installs each provider configured for watching objects in all namespaces.
107+
The `clusterctl init` command by default installs each provider configured for watching objects in all namespaces.
108108

109109
<aside class="note">
110110

@@ -128,7 +128,7 @@ same namespace.
128128
## Provider repositories
129129

130130
To access provider specific information, such as the components YAML to be used for installing a provider,
131-
`clusterctl init` accesses the **provider repositories**, that are well-known places where the release assets for
131+
`clusterctl init` accesses the **provider repositories**, that are well-known places where the release assets for
132132
a provider are published.
133133

134134
See [clusterctl configuration](../configuration.md) for more info about provider repository configurations.
@@ -138,18 +138,18 @@ See [clusterctl configuration](../configuration.md) for more info about provider
138138
<h1> Is it possible to override files read from a provider repository? </h1>
139139

140140
If, for any reasons, the user wants to replace the assets available on a provider repository with a locally available asset,
141-
the user is required to save the file under `$HOME/.cluster-api/overrides/<provider-label>/<version>/<file-name.yaml>`.
141+
the user is required to save the file under `$HOME/.cluster-api/overrides/<provider-label>/<version>/<file-name.yaml>`.
142142

143143
```
144-
$HOME/.cluster-api/overrides//infrastructure-aws/v0.5.2/infrastructure-components.yaml
144+
$HOME/.cluster-api/overrides/infrastructure-aws/v0.5.2/infrastructure-components.yaml
145145
```
146146

147147
</aside>
148148

149149
## Variable substitution
150-
Providers can use variables in the components YAML published in the provider's repository.
150+
Providers can use variables in the components YAML published in the provider's repository.
151151

152-
During `clusterctl init`, those variables are replaced with environment variables or with variables read from the
152+
During `clusterctl init`, those variables are replaced with environment variables or with variables read from the
153153
[clusterctl configuration](../configuration.md).
154154

155155
<aside class="note warning">
@@ -164,7 +164,7 @@ The user should ensure the variables required by a provider are set in advance.
164164

165165
<h1> How can I known which variables a provider requires? </h1>
166166

167-
Users can refer to the provider documentation for the list of variables to be set or use the
167+
Users can refer to the provider documentation for the list of variables to be set or use the
168168
`clusterctl config provider <provider-name>` command to get a list of expected variable names.
169169

170170
</aside>
@@ -175,23 +175,23 @@ When installing a provider, the `clusterctl init` command executes a set of step
175175
the lifecycle management of the provider's components.
176176

177177
* All the provider's components are labeled, so they can be easily identified in
178-
subsequent moments of the provider's lifecycle, e.g. upgrades.
179-
178+
subsequent moments of the provider's lifecycle, e.g. upgrades.
179+
180180
```bash
181181
labels:
182182
- clusterctl.cluster.x-k8s.io: ""
183183
- cluster.x-k8s.io/provider: "<provider-name>"
184184
```
185-
185+
186186
* An additional `Provider` object is created in the target namespace where the provider is installed.
187187
This object keeps track of the provider version, the watching namespace, and other useful information
188-
for the inventory of the providers currently installed in the management cluster.
188+
for the inventory of the providers currently installed in the management cluster.
189189

190190
<aside class="note warning">
191191

192192
<h1>Warning</h1>
193193

194194
The `clusterctl.cluster.x-k8s.io` labels, the `cluster.x-k8s.io/provider` labels and the `Provider` objects MUST NOT be altered.
195-
If this happens, there are no guarantees about the proper functioning of `clusterctl`.
195+
If this happens, there are no guarantees about the proper functioning of `clusterctl`.
196196

197197
</aside>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MachineDeployments, etc. from one management cluster to another management clust
99

1010
Before running `clusterctl move`, the user should take care of preparing the target management cluster, including also installing
1111
all the required provider using `clusterctl init`.
12-
12+
1313
The version of the providers installed in the target management cluster should be at least the same version of the
1414
corresponding provider in the source cluster.
1515

@@ -29,10 +29,10 @@ to move the Cluster API objects defined in another namespace, you can use the `-
2929
<h1> Pause Reconciliation </h1>
3030

3131
Before moving a `Cluster`, clusterctl sets the `Cluster.Spec.Paused` field to `true` stopping
32-
the controllers to reconcile the workload cluster _in the source management cluster_.
32+
the controllers from reconciling the workload cluster _in the source management cluster_.
3333

3434
The `Cluster` object created in the target management cluster instead will be actively reconciled as soon as the move
35-
process completes.
35+
process completes.
3636

3737
</aside>
3838

@@ -58,7 +58,7 @@ This can now be achieved with the following procedure:
5858
3. Use `clusterctl config cluster ... | kubectl apply -f -` to provision a target management cluster
5959
4. Wait for the target management cluster to be up and running
6060
5. Get the kubeconfig for the new target management cluster
61-
6. Use `clusterctl init` with the new cluster's kubeconfig to install the provider components
61+
6. Use `clusterctl init` with the new cluster's kubeconfig to install the provider components
6262
7. Use `clusterctl move` to move the Cluster API resources from the bootstrap cluster to the target management cluster
6363
8. Delete the bootstrap cluster
6464

docs/book/src/clusterctl/configuration.md

+16-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# clusterctl Configuration File
22

3-
The `clusterctl` config file is located at `$HOME/.cluster-api/clusterctl.yaml` and it can be used to:
3+
The `clusterctl` config file is located at `$HOME/.cluster-api/clusterctl.yaml`.
4+
It can be used to:
45

56
- Customize the list of providers and provider repositories.
67
- Provide configuration values to be used for variable substitution when installing providers or creating clusters.
@@ -34,7 +35,7 @@ See [provider contract](provider-contract.md) for instructions about how to set
3435
3536
## Variables
3637
37-
When installing a provider `clusterctl` reads a YAML file that is published in the provider repository; while executing
38+
When installing a provider `clusterctl` reads a YAML file that is published in the provider repository. While executing
3839
this operation, `clusterctl` can substitute certain variables with the ones provided by the user.
3940

4041
The same mechanism also applies when `clusterctl` reads the cluster templates YAML published in the repository, e.g.
@@ -48,7 +49,8 @@ variables in the `clusterctl` config file:
4849
AWS_B64ENCODED_CREDENTIALS: XXXXXXXX
4950
```
5051

51-
In case a variable is defined both in the config file and as an OS environment variable, the latter takes precedence.
52+
In case a variable is defined both in the config file and as an OS environment variable,
53+
the environment variable takes precedence.
5254

5355
## Overrides Layer
5456

@@ -57,11 +59,14 @@ cluster templates and metadata. By default, it reads the files from
5759
`$HOME/.cluster-api/overrides`.
5860

5961
The directory structure under the `overrides` directory should follow the
60-
template
62+
template:
63+
6164
```
6265
<providerType-providerName>/<version>/<fileName>
6366
```
67+
6468
For example,
69+
6570
```
6671
├── bootstrap-kubeadm
6772
│   └── v0.3.0
@@ -78,37 +83,39 @@ For example,
7883
└── infrastructure-components.yaml
7984
```
8085
81-
For developers who want to generate the overrides layer, see [Run the
82-
local-overrides hack!](developers.md#run-the-local-overrides-hack).
86+
For developers who want to generate the overrides layer, see
87+
[Build artifacts locally](developers.md#build-artifacts-locally).
8388
8489
Once these overrides are specified, `clusterctl` will use them instead of
8590
getting the values from the default or specified providers.
8691
8792
One example usage of the overrides layer is that it allows you to deploy
8893
clusters with custom templates that may not be available from the official
8994
provider repositories.
90-
For example, you can now do
95+
For example, you can now do:
96+
9197
```bash
9298
clusterctl config cluster mycluster --flavor dev --infrastructure aws:v0.5.0 -v5
9399
```
94100

95101
The `-v5` provides verbose logging which will confirm the usage of the
96102
override file.
103+
97104
```bash
98105
Using Override="cluster-template-dev.yaml" Provider="infrastructure-aws" Version="v0.5.0"
99106
```
100107

101108
Another example, if you would like to deploy a custom version of CAPA, you can
102109
make changes to `infrastructure-components.yaml` in the overrides folder and
103110
run,
111+
104112
```bash
105113
clusterctl init --infrastructure aws:v0.5.0 -v5
106114
...
107115
Using Override="infrastructure-components.yaml" Provider="infrastructure-aws" Version="v0.5.0"
108116
...
109117
```
110118

111-
112119
If you prefer to have the overrides directory at a different location (e.g.
113120
`/Users/foobar/workspace/dev-releases`) you can specify the overrides
114121
directory in the clusterctl config file as
@@ -177,9 +184,8 @@ The value string is a possibly signed sequence of decimal numbers, each with opt
177184

178185
If no value is specified or the format is invalid, the default value of 10 minutes will be used.
179186

180-
181187
## Debugging/Logging
182188

183189
To have more verbose logs you can use the `-v` flag when running the `clusterctl` and set the level of the logging verbose with a positive integer number, ie. `-v 3`.
184190

185-
If you do not want to use the flag every time you issue a command you can set the environment variable `CLUSTERCTL_LOG_LEVEL` or set the variable in the `clusterctl` config file which is located by default at `$HOME/.cluster-api/clusterctl.yaml`.
191+
If you do not want to use the flag every time you issue a command you can set the environment variable `CLUSTERCTL_LOG_LEVEL` or set the variable in the `clusterctl` config file located by default at `$HOME/.cluster-api/clusterctl.yaml`.

0 commit comments

Comments
 (0)