Skip to content

Commit 66ca410

Browse files
committed
Remove more traces of xmydatabase
No more claims means no more x prefix! Signed-off-by: Nic Cope <[email protected]>
1 parent 1f37523 commit 66ca410

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

content/v2.0-preview/composition/composite-resource-definitions.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ Creating a new API requires defining an API
5353
apiVersion: apiextensions.crossplane.io/v1
5454
kind: CompositeResourceDefinition
5555
metadata:
56-
name: xmydatabases.example.org
56+
name: mydatabases.example.org
5757
spec:
5858
group: example.org
5959
names:
6060
kind: XMyDatabase
61-
plural: xmydatabases
61+
plural: mydatabases
6262
versions:
6363
- name: v1alpha1
6464
# Removed for brevity
@@ -68,14 +68,14 @@ After applying an XRD, Crossplane creates a new Kubernetes custom resource
6868
definition matching the defined API.
6969

7070
For example, the XRD
71-
{{<hover label="xrd1" line="4">}}xmydatabases.example.org{{</hover >}}
71+
{{<hover label="xrd1" line="4">}}mydatabases.example.org{{</hover >}}
7272
creates a custom resource definition
73-
{{<hover label="kubeapi" line="2">}}xmydatabases.example.org{{</hover >}}.
73+
{{<hover label="kubeapi" line="2">}}mydatabases.example.org{{</hover >}}.
7474

7575
```shell {label="kubeapi",copy-lines="3"}
7676
kubectl api-resources
7777
NAME SHORTNAMES APIVERSION NAMESPACED KIND
78-
xmydatabases.example.org v1alpha1 true xmydatabases
78+
mydatabases.example.org v1alpha1 true mydatabases
7979
# Removed for brevity
8080
```
8181

@@ -118,22 +118,22 @@ The XRD
118118
{{<hover label="xrdName" line="6">}}group{{</hover>}}.
119119

120120
For example, {{<hover label="xrdName"
121-
line="4">}}xmydatabases.example.org{{</hover>}} matches the {{<hover
121+
line="4">}}mydatabases.example.org{{</hover>}} matches the {{<hover
122122
label="xrdName" line="9">}}plural{{</hover>}} name
123-
{{<hover label="xrdName" line="9">}}xmydatabases{{</hover>}}, `.`
123+
{{<hover label="xrdName" line="9">}}mydatabases{{</hover>}}, `.`
124124
{{<hover label="xrdName" line="6">}}group{{</hover>}} name,
125125
{{<hover label="xrdName" line="6">}}example.org{{</hover>}}.
126126

127127
```yaml {label="xrdName",copy-lines="none"}
128128
apiVersion: apiextensions.crossplane.io/v1
129129
kind: CompositeResourceDefinition
130130
metadata:
131-
name: xmydatabases.example.org
131+
name: mydatabases.example.org
132132
spec:
133133
group: example.org
134134
names:
135135
kind: XMyDatabase
136-
plural: xmydatabases
136+
plural: mydatabases
137137
# Removed for brevity
138138
```
139139
{{</hint >}}

content/v2.0-preview/composition/composite-resources.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ Creating composite resources requires a
3030
[Composition]({{<ref "./compositions">}}) and a
3131
[CompositeResourceDefinition]({{<ref "./composite-resource-definitions">}})
3232
(`XRD`).
33-
The Composition defines the set of resources to create.
34-
The XRD defines the custom API users call to request the set of resources.
33+
34+
The Composition defines the set of resources to create. The XRD defines the
35+
custom API users call to request the set of resources.
3536

3637
![Diagram of the relationship of Crossplane components](/media/composition-how-it-works.svg)
3738

38-
XRDs define the API used to create a composite resource.
39-
For example,
39+
XRDs define the API used to create a composite resource. For example,
4040
this {{<hover label="xrd1" line="2">}}CompositeResourceDefinition{{</hover>}}
4141
creates a custom API endpoint
42-
{{<hover label="xrd1" line="4">}}xmydatabases.example.org{{</hover>}}.
42+
{{<hover label="xrd1" line="4">}}mydatabases.example.org{{</hover>}}.
4343

4444
```yaml {label="xrd1",copy-lines="none"}
4545
apiVersion: apiextensions.crossplane.io/v1
@@ -55,7 +55,7 @@ spec:
5555
```
5656

5757
When a user calls the custom API,
58-
{{<hover label="xrd1" line="4">}}xmydatabases.example.org{{</hover>}},
58+
{{<hover label="xrd1" line="4">}}mydatabases.example.org{{</hover>}},
5959
Crossplane chooses the Composition to use based on the Composition's
6060
{{<hover label="typeref" line="6">}}compositeTypeRef{{</hover>}}
6161

@@ -196,8 +196,8 @@ Find the Composition revision name from
196196
```shell {label="getcomprev",copy-lines="1"}
197197
kubectl get compositionrevision
198198
NAME REVISION XR-KIND XR-APIVERSION AGE
199-
my-composition-5c976ad 1 xmydatabases example.org/v1alpha1 65m
200-
my-composition-b5aa1eb 2 xmydatabases example.org/v1alpha1 64m
199+
my-composition-5c976ad 1 mydatabases example.org/v1alpha1 65m
200+
my-composition-b5aa1eb 2 mydatabases example.org/v1alpha1 64m
201201
```
202202
{{< /hint >}}
203203

@@ -316,6 +316,6 @@ creating a reference between the resource and owning composite resource.
316316
```shell {label="complabel",copy-lines="1"}
317317
kubectl describe mydatabase.example.org/my-database-x9rx9
318318
Name: my-database2-x9rx9
319-
Namespace:
319+
Namespace: default
320320
Labels: crossplane.io/composite=my-database-x9rx9
321321
```

0 commit comments

Comments
 (0)