Skip to content

Commit 15c896d

Browse files
authored
Merge pull request #810 from jbw976/fix-all-vales
Fix all Vale errors
2 parents e5e5922 + d9f28cf commit 15c896d

Some content is hidden

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

51 files changed

+441
-401
lines changed

.github/workflows/vale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Install Vale
2525
env:
26-
VALE_VERSION: "2.28.2"
26+
VALE_VERSION: "3.7.1"
2727
run: wget https://github.com/errata-ai/vale/releases/download/v${{env.VALE_VERSION}}/vale_${{env.VALE_VERSION}}_Linux_64-bit.tar.gz && tar -xvzf vale_${{env.VALE_VERSION}}_Linux_64-bit.tar.gz
2828

2929
- name: Run Vale

content/contribute/_index.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ here.
5555
generator, CSS layouts and JavaScript.
5656

5757
## Licensing
58-
The Crossplane documentation is under the [Creative Commons
59-
Attribution](https://creativecommons.org/licenses/by/4.0/) license. CC-BY allows
60-
reuse, remixing and republishing of Crossplane documentation with attribution to
61-
the Crossplane organization.
58+
The Crossplane documentation is under the [Creative Commons Attribution](https://creativecommons.org/licenses/by/4.0/)
59+
license. CC-BY allows reuse, remixing and republishing of Crossplane
60+
documentation with attribution to the Crossplane organization.
6261

6362
## Issues and feature requests
6463
Open an [issue](https://github.com/crossplane/crossplane/issues)

content/contribute/vale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ content. The community approves PRs with Vale errors in unmodified document sect
2222
Follow the directions on the Vale website to
2323
[install the Vale binary](https://vale.sh/docs/vale-cli/installation/).
2424
<!-- vale off -->
25-
Crossplane CI uses [Vale v2.22.0](https://github.com/errata-ai/vale/releases/tag/v2.22.0) or later.
25+
Crossplane CI uses [Vale v3.7.1](https://github.com/errata-ai/vale/releases/tag/v3.7.1) or later.
2626
<!-- vale on -->
2727
## Run Vale
2828

content/contribute/writing-style-guide.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The most important points of the style guide include:
2323
users. When in doubt, spell it out first.
2424
* Avoid assuming the reader already knows the background.
2525
* Don't use [cliches](https://www.topcreativewritingcourses.com/blog/common-cliches-in-writing-and-how-to-avoid-them).
26-
* Cliches make writing sound unprofessional and are not internationally inclusive.
26+
* Cliches make writing sound unprofessional and aren't internationally inclusive.
2727
* Use contractions for phrases like "do not," "cannot," "is not" and related terms.
2828
* It's easy to miss "not" in "do not." It's hard to misunderstand "don't."
2929
* Don't use Latin terms (i.e., e.g., etc.).
@@ -48,8 +48,7 @@ users. When in doubt, spell it out first.
4848
Crossplane relies on [Vale](https://github.com/errata-ai/vale) to enforce the
4949
complete style guide.
5050

51-
Read more about [using Vale with the Crossplane
52-
documentation]({{<ref "Vale" >}}).
51+
Read more about [using Vale with the Crossplane documentation]({{<ref "Vale" >}}).
5352

5453
## Italics
5554

content/master/concepts/composition-revisions.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ metadata:
9393
spec:
9494
parameters:
9595
storageGB: 20
96-
# The Manual policy specifies that you do not want this XR to update to the
96+
# The Manual policy specifies that you don't want this XR to update to the
9797
# latest CompositionRevision automatically.
9898
compositionUpdatePolicy: Manual
9999
compositionRef:
@@ -348,8 +348,8 @@ myvpcs.aws.example.upbound.io-727b3c8 2 staging
348348
myvpcs.aws.example.upbound.io-ad265bc 1 dev
349349
```
350350

351-
Verify that Crossplane assigns the Composite Resources `vpc-auto` and `vpc-staging` to Composite revision:2.
352-
XRs `vpc-man` and `vpc-dev` are still assigned to the original revision:1:
351+
Verify that Crossplane assigns the Composite Resources `vpc-auto` and `vpc-staging` to Composite `revision:2`.
352+
XRs `vpc-man` and `vpc-dev` are still assigned to the original `revision:1`:
353353

354354
```shell
355355
kubectl get composite -o="custom-columns=NAME:.metadata.name,SYNCED:.status.conditions[0].status,REVISION:.spec.compositionRevisionRef.name,POLICY:.spec.compositionUpdatePolicy,MATCHLABEL:.spec.compositionRevisionSelector.matchLabels"
@@ -365,7 +365,7 @@ vpc-staging True myvpcs.aws.example.upbound.io-727b3c8 Automatic map[c
365365

366366
{{< hint "note" >}}
367367
`vpc-auto` always use the latest Revision.
368-
`vpc-staging` now matches the label applied to Revision revision:2.
368+
`vpc-staging` now matches the label applied to Revision `revision:2`.
369369
{{< /hint >}}
370370

371371
#### Update Composition Spec and Label
@@ -427,8 +427,8 @@ myvpcs.aws.example.upbound.io-f81c553 3 dev
427427
Changing the label and the spec values simultaneously is critical for deploying new changes to the `dev` channel.
428428
{{< /hint >}}
429429

430-
Verify Crossplane assigns the Composite Resources `vpc-auto` and `vpc-dev` to Composite revision:3.
431-
`vpc-staging` is assigned to revision:2, and `vpc-man` is still assigned to the original revision:1:
430+
Verify Crossplane assigns the Composite Resources `vpc-auto` and `vpc-dev` to Composite `revision:3`.
431+
`vpc-staging` is assigned to `revision:2`, and `vpc-man` is still assigned to the original `revision:1`:
432432

433433
```shell
434434
kubectl get composite -o="custom-columns=NAME:.metadata.name,SYNCED:.status.conditions[0].status,REVISION:.spec.compositionRevisionRef.name,POLICY:.spec.compositionUpdatePolicy,MATCHLABEL:.spec.compositionRevisionSelector.matchLabels"
@@ -444,8 +444,8 @@ vpc-staging True myvpcs.aws.example.upbound.io-727b3c8 Automatic map[c
444444

445445

446446
{{< hint "note" >}}
447-
`vpc-dev` matches the updated label applied to Revision revision:3.
448-
`vpc-staging` matches the label applied to Revision revision:2.
447+
`vpc-dev` matches the updated label applied to Revision `revision:3`.
448+
`vpc-staging` matches the label applied to Revision `revision:2`.
449449
{{< /hint >}}
450450

451451

content/master/concepts/packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ Status:
339339
Events:
340340
Type Reason Age From Message
341341
---- ------ ---- ---- -------
342-
Warning LintPackage 29s (x2 over 29s) packages/configurationrevision.pkg.crossplane.io incompatible Crossplane version: package is not compatible with Crossplane version (v1.12.0)
342+
Warning LintPackage 29s (x2 over 29s) packages/configurationrevision.pkg.crossplane.io incompatible Crossplane version: package isn't compatible with Crossplane version (v1.12.0)
343343
```
344344

345345
The {{<hover label="depend" line="18">}}Events{{</hover>}} show a

content/master/concepts/providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ Status:
351351
Events:
352352
Type Reason Age From Message
353353
---- ------ ---- ---- -------
354-
Warning LintPackage 41s (x3 over 47s) packages/providerrevision.pkg.crossplane.io incompatible Crossplane version: package is not compatible with Crossplane version (v1.10.0)
354+
Warning LintPackage 41s (x3 over 47s) packages/providerrevision.pkg.crossplane.io incompatible Crossplane version: package isn't compatible with Crossplane version (v1.10.0)
355355
```
356356

357357
The {{<hover label="depend" line="17">}}Events{{</hover>}} show a

content/master/guides/crossplane-with-argo-cd.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ weight: 270
55

66
[Argo CD](https://argoproj.github.io/cd/) and [Crossplane](https://crossplane.io)
77
are a great combination. Argo CD provides GitOps while Crossplane turns any Kubernetes
8-
cluster into a Universal Control Plane for all of your resources. There are
9-
configuration details required in order for the two to work together properly.
8+
cluster into a Universal Control Plane for all of your resources. Configuration details are
9+
required in order for the two to work together properly.
1010
This doc will help you understand these requirements. It is recommended to use
1111
Argo CD version 2.4.8 or later with Crossplane.
1212

1313
Argo CD synchronizes Kubernetes resource manifests stored in a Git repository
14-
with those running in a Kubernetes cluster (GitOps). There are different ways to configure
15-
how Argo CD tracks resources. With Crossplane, you need to configure Argo CD
14+
with those running in a Kubernetes cluster (GitOps). Argo CD has different ways to configure
15+
how it tracks resources. With Crossplane, you need to configure Argo CD
1616
to use Annotation based resource tracking. See the [Argo CD docs](https://argo-cd.readthedocs.io/en/latest/user-guide/resource_tracking/) for additional detail.
1717

1818
### Configuring Argo CD with Crossplane
@@ -185,12 +185,12 @@ data:
185185

186186
Crossplane providers generates a `ProviderConfigUsage` for each of the managed resource (MR) it handles. This resource
187187
enable representing the relationship between MR and a ProviderConfig so that the controller can use it as finalizer when a
188-
ProviderConfig is deleted. End-users of Crossplane are not expected to interact with this resource.
188+
ProviderConfig is deleted. End users of Crossplane aren't expected to interact with this resource.
189189

190190
Argo CD UI reactivity can be impacted as the number of resource and types grow. To help keep this number low we
191191
recommend hiding all `ProviderConfigUsage` resources from Argo CD UI.
192192

193-
To configure resource exclusion edit the `argocd-cm` `ConfigMap` in the `argocd` `Namespace` as such:
193+
To configure resource exclusion edit the `argocd-cm` `ConfigMap` in the `argocd` `Namespace` as such:
194194
```yaml
195195
apiVersion: v1
196196
kind: ConfigMap
@@ -204,7 +204,7 @@ data:
204204

205205
The use of `"*"` as apiGroups will enable the mechanism for all Crossplane Providers.
206206

207-
#### Increase K8s Client QPS
207+
#### Increase Kubernetes Client QPS
208208

209209
As the number of CRDs grow on a control plane it will increase the amount of queries Argo CD Application Controller
210210
needs to send to the Kubernetes API. If this is the case you can increase the rate limits of the Argo CD Kubernetes client.

content/master/guides/multi-tenant.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ weight: 240
55

66
This guide describes how to use Crossplane effectively in multi-tenant
77
environments by utilizing Kubernetes primitives and compatible policy
8-
enforcement projects in the cloud-native ecosystem.
8+
enforcement projects in the cloud native ecosystem.
99

10-
## TL;DR
10+
## Summary
1111

1212
Infrastructure operators in multi-tenant Crossplane environments typically
1313
utilize composition and Kubernetes RBAC to define lightweight, standardized
@@ -21,7 +21,7 @@ those with more complex environments, may choose to incorporate third-party
2121
policy engines, or scale to multiple Crossplane clusters. The following sections
2222
describe each of these scenarios in greater detail.
2323

24-
- [TL;DR](#tldr)
24+
- [Summary](#summary)
2525
- [Background](#background)
2626
- [Cluster-Scoped Managed Resources](#cluster-scoped-managed-resources)
2727
- [Namespace Scoped Claims](#namespace-scoped-claims)
@@ -109,7 +109,7 @@ in response to the creation of an instance of the XRD. More information about
109109
this architecture can be found in the [Composition] documentation.
110110

111111
Every XRD is exposed at the cluster scope, but only those with `spec.claimNames`
112-
defined will have a namespace-scoped variant.
112+
defined will have a namespace scoped variant.
113113

114114
```yaml
115115
apiVersion: apiextensions.crossplane.io/v1
@@ -131,7 +131,7 @@ When the example above is created, Crossplane will produce two
131131
[CustomResourceDefinitions]:
132132
1. A cluster-scoped type with `kind: XMySQLInstance`. This is referred to as a
133133
**Composite Resource (XR)**.
134-
2. A namespace-scoped type with `kind: MySQLInstance`. This is referred to as a
134+
2. A namespace scoped type with `kind: MySQLInstance`. This is referred to as a
135135
**Claim (XRC)**.
136136

137137
Platform builders may choose to define an arbitrary number of Compositions that
@@ -160,13 +160,13 @@ This feature serves as a lightweight policy mechanism by only giving the
160160
consumer the ability to customize the underlying resources to the extent the
161161
platform builder desires. For instance, in the examples above, a platform
162162
builder may choose to define a `spec.location` field in the schema of the
163-
`XMySQLInstance` that is an enum with options `east` and `west`. In the
163+
`XMySQLInstance` that's an enum with options `east` and `west`. In the
164164
Composition, those fields could map to the `RDSInstance` `spec.region` field,
165165
making the value either `us-east-1` or `us-west-1`. If no other patches were
166166
defined for the `RDSInstance`, giving a user the ability (using RBAC) to create
167167
a `XMySQLInstance` / `MySQLInstance` would be akin to giving the ability to
168-
create a very specifically configured `RDSInstance`, where they can only decide
169-
the region where it lives and they are restricted to two options.
168+
create a specifically configured `RDSInstance`, where they can only decide
169+
the region where it lives and they're restricted to two options.
170170

171171
This model is in contrast to many infrastructure as code tools where the end
172172
user must have provider credentials to create the underlying resources that are
@@ -182,11 +182,11 @@ standardizing on Kubernetes RBAC.
182182
While the ability to define abstract schemas and patches to concrete resource
183183
types using composition is powerful, the ability to define Claim types at the
184184
namespace scope enhances the functionality further by enabling RBAC to be
185-
applied with namespace restrictions. Most users in a cluster do not have access
186-
to cluster-scoped resources as they are considered only relevant to
185+
applied with namespace restrictions. Most users in a cluster don't have access
186+
to cluster-scoped resources as they're considered only relevant to
187187
infrastructure admins by both Kubernetes and Crossplane.
188188

189-
Building on our simple `XMySQLInstance` / `MySQLInstance` example, a platform
189+
Building on our `XMySQLInstance` / `MySQLInstance` example, a platform
190190
builder may choose to define permissions on `MySQLInstance` at the namespace
191191
scope using a `Role`. This allows for giving users the ability to create and
192192
manage `MySQLInstances` in their given namespace, but not the ability to see
@@ -249,15 +249,15 @@ namespace the corresponding `MySQLInstance` was created in.
249249
### Policy Enforcement with Open Policy Agent
250250

251251
In some Crossplane deployment models, only using composition and RBAC to define
252-
policy will not be flexible enough. However, because Crossplane brings
253-
management of external infrastructure to the Kubernetes API, it is well suited
254-
to integrate with other projects in the cloud-native ecosystem. Organizations
252+
policy won't be flexible enough. However, because Crossplane brings
253+
management of external infrastructure to the Kubernetes API, it's well suited
254+
to integrate with other projects in the cloud native ecosystem. Organizations
255255
and individuals that need a more robust policy engine, or just prefer a more
256256
general language for defining policy, often turn to [Open Policy Agent] (OPA).
257-
OPA allows platform builders to write custom logic in [Rego], a domain-specific
257+
OPA allows platform builders to write custom logic in [Rego], a domain specific
258258
language. Writing policy in this manner allows for not only incorporating the
259259
information available in the specific resource being evaluated, but also using
260-
other state represented in the cluster. Crossplane users typically install OPA's
260+
other state represented in the cluster. Crossplane users typically install OPA
261261
[Gatekeeper] to make policy management as streamlined as possible.
262262

263263
> A live demo of using OPA with Crossplane can be viewed [here].
@@ -271,14 +271,16 @@ simpler.
271271
### Reproducible Platforms with Configuration Packages
272272

273273
[Configuration packages] allow platform builders to package their XRDs and
274-
Compositions into [OCI images] that can be distributed via any OCI-compliant
274+
Compositions into [OCI images] that can be distributed via any OCI compliant
275275
image registry. These packages can also declare dependencies on providers,
276276
meaning that a single package can declare all of the granular managed resources,
277277
the controllers that must be deployed to reconcile them, and the abstract types
278278
that expose the underlying resources using composition.
279279

280280
Organizations with many Crossplane deployments utilize Configuration packages to
281+
<!-- vale alex.Condescending = NO -->
281282
reproduce their platform in each cluster. This can be as simple as installing
283+
<!-- vale alex.Condescending = YES -->
282284
Crossplane with the flag to automatically install a Configuration package
283285
alongside it.
284286

content/master/guides/self-signed-ca-certs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Self-Signed CA Certs
33
weight: 270
44
---
55

6-
> Using self-signed certificates is not advised in production, it is
6+
> Using self-signed certificates isn't advised in production, it's
77
recommended to only use self-signed certificates for testing.
88

99
When Crossplane loads Configuration and Provider Packages from private
@@ -39,7 +39,7 @@ kubectl -n [Crossplane system namespace] create cm ca-bundle-config \
3939
`ca-bundle-config` and the `registryCaBundleConfig.key` parameter to
4040
`ca-bundle`.
4141

42-
> Providing Helm with parameter values is convered in the Helm docs,
42+
> Providing Helm with parameter values is covered in the Helm docs,
4343
[Helm install](https://helm.sh/docs/helm/helm_install/). An example block
4444
in an `override.yaml` file would look like this:
4545
```

0 commit comments

Comments
 (0)