Skip to content

Commit 5e5a548

Browse files
committed
Clarify that it's not always m.crossplane.io
Signed-off-by: Nic Cope <[email protected]>
1 parent 4220ceb commit 5e5a548

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed

content/master/guides/upgrade-to-crossplane-v2.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,17 @@ metadata:
177177
spec:
178178
activate:
179179
# Legacy cluster-scoped resources (existing v1 resources)
180-
- buckets.s3.aws.crossplane.io
181-
- instances.ec2.aws.crossplane.io
180+
- buckets.s3.aws.upbound.io
181+
- instances.ec2.aws.upbound.io
182182

183183
# Modern namespaced resources (new v2 resources)
184-
- buckets.s3.aws.m.crossplane.io
185-
- instances.ec2.aws.m.crossplane.io
184+
- buckets.s3.aws.m.upbound.io
185+
- instances.ec2.aws.m.upbound.io
186186
```
187187
188188
{{<hint "tip">}}
189-
Notice the distinction: `s3.aws.crossplane.io` (legacy cluster-scoped) vs
190-
`s3.aws.m.crossplane.io` (v2 namespaced). The `.m.` indicates modern
189+
Notice the distinction: `s3.aws.upbound.io` (legacy cluster-scoped) vs
190+
`s3.aws.m.upbound.io` (v2 namespaced). The `.m.` indicates modern
191191
namespaced managed resources.
192192
{{</hint>}}
193193

@@ -246,10 +246,18 @@ For example `provider-aws-s3:v2.0.0` has two `Bucket` MRs:
246246
The `spec.forProvider` and `status.atProvider` fields are schematically
247247
identical.
248248

249-
{{<hint "note">}}
249+
{{<hint "tip">}}
250250
Use `kubectl get mrds` to see available MR API versions.
251251
{{</hint>}}
252252

253+
{{<hint "note">}}
254+
Not all providers use `.crossplane.io` domains. For example, `provider-aws-s3`
255+
uses `.upbound.io` domains for historical reasons. The general pattern for
256+
namespaced resources is adding `.m` to the existing domain: `<domain>` becomes
257+
`m.<domain>` (like `upbound.io` → `m.upbound.io` or `crossplane.io` →
258+
`m.crossplane.io`).
259+
{{</hint>}}
260+
253261
**Before (v1 cluster-scoped)**:
254262
```yaml
255263
apiVersion: apiextensions.crossplane.io/v1
@@ -271,7 +279,7 @@ spec:
271279
source: Inline
272280
inline:
273281
template: |
274-
apiVersion: s3.aws.crossplane.io/v1beta2
282+
apiVersion: s3.aws.upbound.io/v1beta2
275283
kind: Bucket
276284
metadata:
277285
name: {{ .observed.composite.resource.metadata.name }}
@@ -301,7 +309,7 @@ spec:
301309
source: Inline
302310
inline:
303311
template: |
304-
apiVersion: s3.aws.m.crossplane.io/v1beta1 # Added .m, reset to v1beta1
312+
apiVersion: s3.aws.m.upbound.io/v1beta1 # Added .m, reset to v1beta1
305313
kind: Bucket
306314
metadata:
307315
name: {{ .observed.composite.resource.metadata.name }}

content/v2.0/guides/upgrade-to-crossplane-v2.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,17 @@ metadata:
177177
spec:
178178
activate:
179179
# Legacy cluster-scoped resources (existing v1 resources)
180-
- buckets.s3.aws.crossplane.io
181-
- instances.ec2.aws.crossplane.io
180+
- buckets.s3.aws.upbound.io
181+
- instances.ec2.aws.upbound.io
182182

183183
# Modern namespaced resources (new v2 resources)
184-
- buckets.s3.aws.m.crossplane.io
185-
- instances.ec2.aws.m.crossplane.io
184+
- buckets.s3.aws.m.upbound.io
185+
- instances.ec2.aws.m.upbound.io
186186
```
187187
188188
{{<hint "tip">}}
189-
Notice the distinction: `s3.aws.crossplane.io` (legacy cluster-scoped) vs
190-
`s3.aws.m.crossplane.io` (v2 namespaced). The `.m.` indicates modern
189+
Notice the distinction: `s3.aws.upbound.io` (legacy cluster-scoped) vs
190+
`s3.aws.m.upbound.io` (v2 namespaced). The `.m.` indicates modern
191191
namespaced managed resources.
192192
{{</hint>}}
193193

@@ -246,10 +246,18 @@ For example `provider-aws-s3:v2.0.0` has two `Bucket` MRs:
246246
The `spec.forProvider` and `status.atProvider` fields are schematically
247247
identical.
248248

249-
{{<hint "note">}}
249+
{{<hint "tip">}}
250250
Use `kubectl get mrds` to see available MR API versions.
251251
{{</hint>}}
252252

253+
{{<hint "note">}}
254+
Not all providers use `.crossplane.io` domains. For example, `provider-aws-s3`
255+
uses `.upbound.io` domains for historical reasons. The general pattern for
256+
namespaced resources is adding `.m` to the existing domain: `<domain>` becomes
257+
`m.<domain>` (like `upbound.io` → `m.upbound.io` or `crossplane.io` →
258+
`m.crossplane.io`).
259+
{{</hint>}}
260+
253261
**Before (v1 cluster-scoped)**:
254262
```yaml
255263
apiVersion: apiextensions.crossplane.io/v1
@@ -271,7 +279,7 @@ spec:
271279
source: Inline
272280
inline:
273281
template: |
274-
apiVersion: s3.aws.crossplane.io/v1beta2
282+
apiVersion: s3.aws.upbound.io/v1beta2
275283
kind: Bucket
276284
metadata:
277285
name: {{ .observed.composite.resource.metadata.name }}
@@ -301,7 +309,7 @@ spec:
301309
source: Inline
302310
inline:
303311
template: |
304-
apiVersion: s3.aws.m.crossplane.io/v1beta1 # Added .m, reset to v1beta1
312+
apiVersion: s3.aws.m.upbound.io/v1beta1 # Added .m, reset to v1beta1
305313
kind: Bucket
306314
metadata:
307315
name: {{ .observed.composite.resource.metadata.name }}

0 commit comments

Comments
 (0)