Skip to content

Commit f9e22eb

Browse files
authored
Merge pull request #13197 from k8s-infra-cherrypick-robot/cherry-pick-13193-to-release-1.12
[release-1.12] 📖 docs: fix typos and docs formatting improvements
2 parents ad6cd10 + 8c54fed commit f9e22eb

File tree

11 files changed

+14
-16
lines changed

11 files changed

+14
-16
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Cluster API follows upstream Kubernetes semantic versioning. With the v1 release
7575

7676
- A (*patch*) release SHOULD only include backwards compatible set of bugfixes.
7777

78-
see [Cluster API release support](https://cluster-api.sigs.k8s.io/reference/versions.html#cluster-api-release-support)) for
78+
see [Cluster API release support](https://cluster-api.sigs.k8s.io/reference/versions.html#cluster-api-release-support) for
7979
more details about supported releases and for considerations that might apply if you are importing Cluster API go modules as a dependency.
8080

8181
#### Backporting a patch

docs/book/src/developer/core/controllers/machine.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Among those rules:
1717
- InfraMachine SHOULD report [terminal failures](../../providers/contracts/infra-machine.md#inframachine-terminal-failures)
1818

1919
Similarly, in order to support different machine bootstrappers, The Machine resource references
20-
a BootstrapConfig object, e.g. KubeadmBoostrapConfig etc.
20+
a BootstrapConfig object, e.g. KubeadmBootstrapConfig etc.
2121

2222
The [BootstrapConfig resource contract](../../providers/contracts/bootstrap-config.md) defines a set of rules a provider is expected to comply with in order to allow
2323
the expected interactions with the Machine controller.

docs/book/src/developer/core/repository-layout.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Some of the subfolders are:
8484

8585
* [~/config/webhook](https://github.com/kubernetes-sigs/cluster-api/tree/main/config/webhook) - Manifest for webhooks generated from the markers defined in the web hook implementations present in [api](#api) folder.
8686

87-
Note: Additional `config` containing manifests can be found in the packages for [KubeadmControlPlane](#controlplane), [KubeadmBoostrap](#bootstrap) and [Cluster API Provider Docker](#cluster-api-provider-docker).
87+
Note: Additional `config` containing manifests can be found in the packages for [KubeadmControlPlane](#controlplane), [KubeadmBootstrap](#bootstrap) and [Cluster API Provider Docker](#cluster-api-provider-docker).
8888

8989
### Controllers
9090

@@ -154,4 +154,4 @@ This directory contains the implementation of some of the Cluster API webhooks.
154154

155155
This folder exposes the custom webhooks present in [~internal/webhooks](#webhooks) to the users of CAPI.
156156

157-
Note: Additional webhook implementations can be found in the API packages for [KubeadmControlPlane](#controlplane), [KubeadmBoostrap](#bootstrap) and [Cluster API Provider Docker](#cluster-api-provider-docker).
157+
Note: Additional webhook implementations can be found in the API packages for [KubeadmControlPlane](#controlplane), [KubeadmBootstrap](#bootstrap) and [Cluster API Provider Docker](#cluster-api-provider-docker).

docs/book/src/reference/api/owner-references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Owner References
22

33
Cluster API uses [Kubernetes owner references](https://kubernetes.io/docs/concepts/overview/working-with-objects/owners-dependents/) to track relationships between objects. These references are used
4-
for Kubernetes garbage collection, which is also used for Cluster deletion in CAPI. They are also used places where
4+
for Kubernetes garbage collection, which is also used for Cluster deletion in CAPI. They are also used in places where
55
the ownership hierarchy is important, for example when using `clusterctl move`.
66

77
CAPI uses owner references in an opinionated way. The following guidelines should be considered:

docs/book/src/reference/providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ learn more about the other users of the same provider.
1212
We also recommend to read provider's documentation carefully, test it, and perform a proper
1313
due diligence before deciding to use a provider in production, like you will do for any other open source project.
1414

15-
We are deeply thankful to all the the providers in the list, because they are a concrete proof
15+
We are deeply thankful to all the providers in the list, because they are a concrete proof
1616
of the liveness of the ecosystem, a relevant part of the history of this community, and a valuable
1717
source of inspiration and ideas for others.
1818

docs/book/src/tasks/diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
With CAPI v1.6 we introduced new flags to allow serving metrics, the pprof endpoint and an endpoint to dynamically change log levels securely in production.
66

7-
This feature is enabled per default via:
7+
This feature is enabled by default via:
88
```yaml
99
args:
1010
- "--diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The `0` in the path refers to the position of the target MachineDeployment in th
8282

8383
To change this value with a patch:
8484
```bash
85-
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "replace", "path": "/spec/topology/workers/machineDeployments/0/replicas", "value": 1}]'
85+
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "replace", "path": "/spec/topology/workers/machineDeployments/0/replicas", "value": 1}]'
8686
```
8787

8888
This patch will make the following changes on the Cluster yaml:
@@ -123,7 +123,7 @@ machinedeployment.cluster.x-k8s.io/capi-quickstart-md-0-XXXX capi-quickstart
123123

124124
A new MachineDeployment can be added to the Cluster by adding a new MachineDeployment spec under `/spec/topology/workers/machineDeployments/`. To do so we can patch our Cluster with:
125125
```bash
126-
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "add", "path": "/spec/topology/workers/machineDeployments/-", "value": {"name": "second-deployment", "replicas": 1, "class": "default-worker"} }]'
126+
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "add", "path": "/spec/topology/workers/machineDeployments/-", "value": {"name": "second-deployment", "replicas": 1, "class": "default-worker"} }]'
127127
```
128128
This patch will make the below changes on the Cluster yaml:
129129
```diff
@@ -157,7 +157,7 @@ When using a managed topology scaling of ControlPlane Machines, where the Cluste
157157
This is done by changing the ControlPlane replicas field at `/spec/topology/controlPlane/replica` in the Cluster object. The command is:
158158

159159
```bash
160-
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "replace", "path": "/spec/topology/controlPlane/replicas", "value": 1}]'
160+
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "replace", "path": "/spec/topology/controlPlane/replicas", "value": 1}]'
161161
```
162162

163163
This patch will make the below changes on the Cluster yaml:
@@ -191,7 +191,7 @@ Which will return something like:
191191

192192
In order to run a different version of etcd in new ControlPlane machines - the part of the spec this variable sets - change the value using the below patch:
193193
```bash
194-
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "replace", "path": "/spec/topology/variables/1/value", "value": "3.5.0"}]'
194+
kubectl patch cluster capi-quickstart --type json --patch '[{"op": "replace", "path": "/spec/topology/variables/1/value", "value": "3.5.0"}]'
195195
```
196196

197197
Running the patch makes the following change to the Cluster yaml:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ when those values are used in patch or when the generated templates are created
805805
[6135](https://github.com/kubernetes-sigs/cluster-api/issues/6135)).
806806

807807
As a consequence we recommend avoiding this practice while we are considering alternatives to make
808-
it explicit for the ClusterClass authors to opt-in in this feature, thus accepting the implied risks.
808+
it explicit for the ClusterClass authors to opt in this feature, thus accepting the implied risks.
809809

810810
### Using variable values in JSON patches
811811

docs/book/src/tasks/experimental-features/experimental-features.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ Following controller manager deployments have to be edited in order to enable/di
9999
* [CAPD](https://cluster-api.sigs.k8s.io/reference/glossary.html?highlight=Providers#capd). Other [Infrastructure Providers](https://cluster-api.sigs.k8s.io/reference/glossary.html?highlight=Providers#infrastructure-provider)
100100
might also require this. Please consult the docs of the concrete [Infrastructure Provider](https://cluster-api.sigs.k8s.io/reference/providers#infrastructure)
101101
regarding this.
102-
103-
* [CAPI](https://cluster-api.sigs.k8s.io/reference/glossary.html?highlight=Gloss#capi).
104102
* [ClusterClass](./cluster-class/index.md):
105103
* [CAPI](https://cluster-api.sigs.k8s.io/reference/glossary.html?highlight=Gloss#capi).
106104
* [KCP](https://cluster-api.sigs.k8s.io/reference/glossary.html?highlight=Gloss#kcp).

docs/book/src/tasks/experimental-features/runtime-sdk/implement-extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ well with practices like unit testing and generally makes the entire system more
279279

280280
### Error messages
281281

282-
RuntimeExtension authors should be aware that error messages are surfaced as a conditions in Kubernetes resources
282+
RuntimeExtension authors should be aware that error messages are surfaced as conditions in Kubernetes resources
283283
and recorded in Cluster API controller's logs. As a consequence:
284284

285285
- Error message must not contain any sensitive information.

0 commit comments

Comments
 (0)