Skip to content

Commit b0b75ce

Browse files
negznegz
authored
Merge pull request #970 from negz/sync
Sync latest master -> v2.0
2 parents 8f06000 + 77f9623 commit b0b75ce

File tree

11 files changed

+265
-172
lines changed

11 files changed

+265
-172
lines changed

‎content/v2.0/cli/command-reference.md‎

Lines changed: 51 additions & 49 deletions
Large diffs are not rendered by default.

‎content/v2.0/get-started/get-started-with-managed-resources.md‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ This guide requires:
3636
* An AWS account with permissions to create an S3 storage bucket
3737
* AWS [access keys](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-quickstart.html#cli-configure-quickstart-creds)
3838
39-
{{<hint "note">}}
40-
AWS managed resources fully support Crossplane v2.
41-
42-
<!-- vale gitlab.FutureTense = NO -->
43-
Maintainers are actively working to update managed resources for other systems including Azure,
44-
GCP, Terraform, Helm, GitHub, etc to support Crossplane v2.
45-
<!-- vale gitlab.FutureTense = YES -->
46-
{{</hint>}}
4739
4840
## Install support for the managed resource
4941
@@ -151,11 +143,11 @@ customizes the settings of the AWS Provider.
151143

152144
All providers need a configuration to tell them where to load credentials.
153145

154-
Create this provider configuration:
146+
Create this cluster-wide provider configuration:
155147

156148
```yaml {label="providerconfig",copy-lines="all"}
157149
apiVersion: aws.m.upbound.io/v1beta1
158-
kind: ProviderConfig
150+
kind: ClusterProviderConfig
159151
metadata:
160152
name: default
161153
spec:
@@ -176,6 +168,15 @@ kubectl apply -f providerconfig.yaml
176168
This tells the provider to load credentials from
177169
[the secret](#save-the-providers-credentials).
178170

171+
{{<hint "note">}}
172+
This example uses a `ClusterProviderConfig` that applies to managed resources
173+
across all namespaces.
174+
175+
You can also use a namespaced `ProviderConfig` that only applies to managed
176+
resources in a specific namespace. See the [`providerConfigRef`]({{<ref "../managed-resources/managed-resources#providerconfigref">}})
177+
section in the managed resources docs for more details.
178+
{{</hint>}}
179+
179180
## Use the managed resource
180181

181182
{{<hint "note">}}

‎content/v2.0/guides/troubleshoot-crossplane.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ weight: 306
66

77
If you use the Crossplane CLI to install a `Provider` or
88
`Configuration` (for example, `crossplane xpkg install provider
9-
xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v1.21.1`) and get `the server
9+
xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v2.0.0`) and get `the server
1010
could not find the requested resource` error, more often than not, that's an
1111
indicator that your Crossplane CLI needs updating. In other words
1212
Crossplane graduated some API from alpha to beta or stable and the old
@@ -105,9 +105,9 @@ spec:
105105
apiVersion: pkg.crossplane.io/v1
106106
kind: Provider
107107
metadata:
108-
name: provider-aws
108+
name: crossplane-contrib-provider-aws-s3
109109
spec:
110-
package: xpkg.crossplane.io/crossplane-contrib/provider-aws:v0.33.0
110+
package: xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v2.0.0
111111
runtimeConfigRef:
112112
apiVersion: pkg.crossplane.io/v1beta1
113113
kind: DeploymentRuntimeConfig
@@ -156,9 +156,9 @@ spec:
156156
apiVersion: pkg.crossplane.io/v1
157157
kind: Provider
158158
metadata:
159-
name: provider-aws
159+
name: crossplane-contrib-provider-aws-s3
160160
spec:
161-
package: xpkg.crossplane.io/crossplane-contrib/provider-aws:v0.33.0
161+
package: xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v2.0.0
162162
runtimeConfigRef:
163163
apiVersion: pkg.crossplane.io/v1beta1
164164
kind: DeploymentRuntimeConfig

‎content/v2.0/guides/uninstall-crossplane.md‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,55 +38,55 @@ command may take minutes to return.
3838
```shell {copy-lines="1"}
3939
kubectl get managed
4040
NAME READY SYNCED EXTERNAL-NAME AGE
41-
securitygroup.ec2.aws.upbound.io/my-db-7mc7h-j84h8 True True sg-0da6e9c29113596b6 3m1s
42-
securitygroup.ec2.aws.upbound.io/my-db-8bhr2-9wsx9 True True sg-02695166f010ec05b 2m26s
41+
securitygroup.ec2.aws.m.upbound.io/my-db-7mc7h-j84h8 True True sg-0da6e9c29113596b6 3m1s
42+
securitygroup.ec2.aws.m.upbound.io/my-db-8bhr2-9wsx9 True True sg-02695166f010ec05b 2m26s
4343

4444
NAME READY SYNCED EXTERNAL-NAME AGE
45-
route.ec2.aws.upbound.io/my-db-7mc7h-vw985 True True r-rtb-05822b8df433e4e2b1080289494 3m1s
46-
route.ec2.aws.upbound.io/my-db-8bhr2-7m2wq False True 2m26s
45+
route.ec2.aws.m.upbound.io/my-db-7mc7h-vw985 True True r-rtb-05822b8df433e4e2b1080289494 3m1s
46+
route.ec2.aws.m.upbound.io/my-db-8bhr2-7m2wq False True 2m26s
4747

4848
NAME READY SYNCED EXTERNAL-NAME AGE
49-
securitygrouprule.ec2.aws.upbound.io/my-db-7mc7h-mkd9s True True sgrule-778063708 3m1s
50-
securitygrouprule.ec2.aws.upbound.io/my-db-8bhr2-lzr89 False True 2m26s
49+
securitygrouprule.ec2.aws.m.upbound.io/my-db-7mc7h-mkd9s True True sgrule-778063708 3m1s
50+
securitygrouprule.ec2.aws.m.upbound.io/my-db-8bhr2-lzr89 False True 2m26s
5151

5252
NAME READY SYNCED EXTERNAL-NAME AGE
53-
routetable.ec2.aws.upbound.io/my-db-7mc7h-mnqvm True True rtb-05822b8df433e4e2b 3m1s
54-
routetable.ec2.aws.upbound.io/my-db-8bhr2-dfhj6 True True rtb-02e875abd25658254 2m26s
53+
routetable.ec2.aws.m.upbound.io/my-db-7mc7h-mnqvm True True rtb-05822b8df433e4e2b 3m1s
54+
routetable.ec2.aws.m.upbound.io/my-db-8bhr2-dfhj6 True True rtb-02e875abd25658254 2m26s
5555

5656
NAME READY SYNCED EXTERNAL-NAME AGE
57-
subnet.ec2.aws.upbound.io/my-db-7mc7h-7m49d True True subnet-0c1ab32c5ec129dd1 3m2s
58-
subnet.ec2.aws.upbound.io/my-db-7mc7h-9t64t True True subnet-07075c17c7a72f79e 3m2s
59-
subnet.ec2.aws.upbound.io/my-db-7mc7h-rs8t8 True True subnet-08e88e826a42e55b4 3m2s
60-
subnet.ec2.aws.upbound.io/my-db-8bhr2-9sjpx True True subnet-05d21c7b52f7ac8ca 2m26s
61-
subnet.ec2.aws.upbound.io/my-db-8bhr2-dvrxf True True subnet-0432310376b5d09de 2m26s
62-
subnet.ec2.aws.upbound.io/my-db-8bhr2-t7dpr True True subnet-0080fdcb6e9b70632 2m26s
57+
subnet.ec2.aws.m.upbound.io/my-db-7mc7h-7m49d True True subnet-0c1ab32c5ec129dd1 3m2s
58+
subnet.ec2.aws.m.upbound.io/my-db-7mc7h-9t64t True True subnet-07075c17c7a72f79e 3m2s
59+
subnet.ec2.aws.m.upbound.io/my-db-7mc7h-rs8t8 True True subnet-08e88e826a42e55b4 3m2s
60+
subnet.ec2.aws.m.upbound.io/my-db-8bhr2-9sjpx True True subnet-05d21c7b52f7ac8ca 2m26s
61+
subnet.ec2.aws.m.upbound.io/my-db-8bhr2-dvrxf True True subnet-0432310376b5d09de 2m26s
62+
subnet.ec2.aws.m.upbound.io/my-db-8bhr2-t7dpr True True subnet-0080fdcb6e9b70632 2m26s
6363

6464
NAME READY SYNCED EXTERNAL-NAME AGE
65-
vpc.ec2.aws.upbound.io/my-db-7mc7h-ktbbh True True vpc-08d7dd84e0c12f33e 3m3s
66-
vpc.ec2.aws.upbound.io/my-db-8bhr2-mrh2x True True vpc-06994bf323fc1daea 2m26s
65+
vpc.ec2.aws.m.upbound.io/my-db-7mc7h-ktbbh True True vpc-08d7dd84e0c12f33e 3m3s
66+
vpc.ec2.aws.m.upbound.io/my-db-8bhr2-mrh2x True True vpc-06994bf323fc1daea 2m26s
6767

6868
NAME READY SYNCED EXTERNAL-NAME AGE
69-
internetgateway.ec2.aws.upbound.io/my-db-7mc7h-s2x4v True True igw-0189c4da07a3142dc 3m1s
70-
internetgateway.ec2.aws.upbound.io/my-db-8bhr2-q7dzl True True igw-01bf2a1dbbebf6a27 2m26s
69+
internetgateway.ec2.aws.m.upbound.io/my-db-7mc7h-s2x4v True True igw-0189c4da07a3142dc 3m1s
70+
internetgateway.ec2.aws.m.upbound.io/my-db-8bhr2-q7dzl True True igw-01bf2a1dbbebf6a27 2m26s
7171

7272
NAME READY SYNCED EXTERNAL-NAME AGE
73-
routetableassociation.ec2.aws.upbound.io/my-db-7mc7h-28qb4 True True rtbassoc-0718d680b5a0e68fe 3m1s
74-
routetableassociation.ec2.aws.upbound.io/my-db-7mc7h-9hdlr True True rtbassoc-0faaedb88c6e1518c 3m1s
75-
routetableassociation.ec2.aws.upbound.io/my-db-7mc7h-txhmz True True rtbassoc-0e5010724ca027864 3m1s
76-
routetableassociation.ec2.aws.upbound.io/my-db-8bhr2-bvgkt False True 2m26s
77-
routetableassociation.ec2.aws.upbound.io/my-db-8bhr2-d9gbg False True 2m26s
78-
routetableassociation.ec2.aws.upbound.io/my-db-8bhr2-k6k8m False True 2m26s
73+
routetableassociation.ec2.aws.m.upbound.io/my-db-7mc7h-28qb4 True True rtbassoc-0718d680b5a0e68fe 3m1s
74+
routetableassociation.ec2.aws.m.upbound.io/my-db-7mc7h-9hdlr True True rtbassoc-0faaedb88c6e1518c 3m1s
75+
routetableassociation.ec2.aws.m.upbound.io/my-db-7mc7h-txhmz True True rtbassoc-0e5010724ca027864 3m1s
76+
routetableassociation.ec2.aws.m.upbound.io/my-db-8bhr2-bvgkt False True 2m26s
77+
routetableassociation.ec2.aws.m.upbound.io/my-db-8bhr2-d9gbg False True 2m26s
78+
routetableassociation.ec2.aws.m.upbound.io/my-db-8bhr2-k6k8m False True 2m26s
7979

8080
NAME READY SYNCED EXTERNAL-NAME AGE
81-
instance.rds.aws.upbound.io/my-db-7mc7h-5d6w4 False True my-db-7mc7h-5d6w4 3m1s
82-
instance.rds.aws.upbound.io/my-db-8bhr2-tx9kf False True my-db-8bhr2-tx9kf 2m26s
81+
instance.rds.aws.m.upbound.io/my-db-7mc7h-5d6w4 False True my-db-7mc7h-5d6w4 3m1s
82+
instance.rds.aws.m.upbound.io/my-db-8bhr2-tx9kf False True my-db-8bhr2-tx9kf 2m26s
8383

8484
NAME READY SYNCED EXTERNAL-NAME AGE
85-
subnetgroup.rds.aws.upbound.io/my-db-7mc7h-8c8n9 True True my-db-7mc7h-8c8n9 3m2s
86-
subnetgroup.rds.aws.upbound.io/my-db-8bhr2-mc5ps True True my-db-8bhr2-mc5ps 2m27s
85+
subnetgroup.rds.aws.m.upbound.io/my-db-7mc7h-8c8n9 True True my-db-7mc7h-8c8n9 3m2s
86+
subnetgroup.rds.aws.m.upbound.io/my-db-8bhr2-mc5ps True True my-db-8bhr2-mc5ps 2m27s
8787

8888
NAME READY SYNCED EXTERNAL-NAME AGE
89-
bucket.s3.aws.upbound.io/crossplane-bucket-867737b10 True True
89+
bucket.s3.aws.m.upbound.io/crossplane-bucket-867737b10 True True
9090
crossplane-bucket-867737b10 5m26s
9191
```
9292

@@ -121,13 +121,13 @@ Use `kubectl get managed` to view remaining _managed resources_.
121121
```shell {copy-lines="1"}
122122
kubectl get managed
123123
NAME READY SYNCED EXTERNAL-NAME AGE
124-
bucket.s3.aws.upbound.io/crossplane-bucket-867737b10 True True crossplane-bucket-867737b10 8h
124+
bucket.s3.aws.m.upbound.io/crossplane-bucket-867737b10 True True crossplane-bucket-867737b10 8h
125125
```
126126

127127
Use `kubectl delete` to remove the resources.
128128

129129
```shell
130-
kubectl delete bucket.s3.aws.upbound.io/crossplane-bucket-867737b10
130+
kubectl delete bucket.s3.aws.m.upbound.io/crossplane-bucket-867737b10
131131
```
132132

133133
<!-- vale Google.Headings = NO -->
@@ -139,7 +139,7 @@ List the installed _providers_ with `kubectl get providers`.
139139
```shell {copy-lines="1"}
140140
kubectl get providers
141141
NAME INSTALLED HEALTHY PACKAGE AGE
142-
crossplane-contrib-provider-aws True True xpkg.crossplane.io/crossplane-contrib/provider-aws:v1.21.1 8h
142+
crossplane-contrib-provider-aws-s3 True True xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v2.0.0 8h
143143
```
144144

145145
Remove the installed _providers_ with `kubectl delete provider`.

‎content/v2.0/guides/write-a-composition-function-in-go.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ import (
275275
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
276276
"k8s.io/utils/ptr"
277277

278-
"github.com/upbound/provider-aws/apis/s3/v1beta1"
278+
"github.com/crossplane-contrib/provider-upjet-aws/apis/s3/v1beta1"
279279

280280
"github.com/crossplane/function-sdk-go/errors"
281281
"github.com/crossplane/function-sdk-go/logging"
@@ -432,7 +432,7 @@ using the same strongly typed structs Crossplane uses in its providers.
432432
You must get the AWS Provider Go module to use this type:
433433

434434
```shell
435-
go get github.com/upbound/provider-aws@v1.14.0
435+
go get github.com/crossplane-contrib/provider-upjet-aws@v2.0.0
436436
```
437437

438438
Crossplane provides a
@@ -528,7 +528,7 @@ func TestRunFunction(t *testing.T) {
528528
Desired: &fnv1.State{
529529
Resources: map[string]*fnv1.Resource{
530530
"xbuckets-test-bucket-a": {Resource: resource.MustStructJSON(`{
531-
"apiVersion": "s3.aws.upbound.io/v1beta1",
531+
"apiVersion": "s3.aws.m.upbound.io/v1beta1",
532532
"kind": "Bucket",
533533
"metadata": {
534534
"annotations": {
@@ -545,7 +545,7 @@ func TestRunFunction(t *testing.T) {
545545
}
546546
}`)},
547547
"xbuckets-test-bucket-b": {Resource: resource.MustStructJSON(`{
548-
"apiVersion": "s3.aws.upbound.io/v1beta1",
548+
"apiVersion": "s3.aws.m.upbound.io/v1beta1",
549549
"kind": "Bucket",
550550
"metadata": {
551551
"annotations": {
@@ -727,7 +727,7 @@ kind: XBuckets
727727
metadata:
728728
name: example-buckets
729729
---
730-
apiVersion: s3.aws.upbound.io/v1beta1
730+
apiVersion: s3.aws.m.upbound.io/v1beta1
731731
kind: Bucket
732732
metadata:
733733
annotations:
@@ -742,7 +742,7 @@ spec:
742742
forProvider:
743743
region: us-east-2
744744
---
745-
apiVersion: s3.aws.upbound.io/v1beta1
745+
apiVersion: s3.aws.m.upbound.io/v1beta1
746746
kind: Bucket
747747
metadata:
748748
annotations:
@@ -757,7 +757,7 @@ spec:
757757
forProvider:
758758
region: us-east-2
759759
---
760-
apiVersion: s3.aws.upbound.io/v1beta1
760+
apiVersion: s3.aws.m.upbound.io/v1beta1
761761
kind: Bucket
762762
metadata:
763763
annotations:

‎content/v2.0/guides/write-a-composition-function-in-python.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ async def RunFunction(self, req: fnv1.RunFunctionRequest, _: grpc.aio.ServicerCo
187187
for name in names:
188188
rsp.desired.resources[f"xbuckets-{name}"].resource.update(
189189
{
190-
"apiVersion": "s3.aws.upbound.io/v1beta1",
190+
"apiVersion": "s3.aws.m.upbound.io/v1beta1",
191191
"kind": "Bucket",
192192
"metadata": {
193193
"annotations": {
@@ -261,7 +261,7 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
261261
# https://protobuf.dev/reference/python/python-generated/#map-fields
262262
rsp.desired.resources[f"xbuckets-{name}"].resource.update(
263263
{
264-
"apiVersion": "s3.aws.upbound.io/v1beta1",
264+
"apiVersion": "s3.aws.m.upbound.io/v1beta1",
265265
"kind": "Bucket",
266266
"metadata": {
267267
"annotations": {
@@ -399,7 +399,7 @@ class TestFunctionRunner(unittest.IsolatedAsyncioTestCase):
399399
"xbuckets-test-bucket-a": fnv1.Resource(
400400
resource=resource.dict_to_struct(
401401
{
402-
"apiVersion": "s3.aws.upbound.io/v1beta1",
402+
"apiVersion": "s3.aws.m.upbound.io/v1beta1",
403403
"kind": "Bucket",
404404
"metadata": {
405405
"annotations": {
@@ -415,7 +415,7 @@ class TestFunctionRunner(unittest.IsolatedAsyncioTestCase):
415415
"xbuckets-test-bucket-b": fnv1.Resource(
416416
resource=resource.dict_to_struct(
417417
{
418-
"apiVersion": "s3.aws.upbound.io/v1beta1",
418+
"apiVersion": "s3.aws.m.upbound.io/v1beta1",
419419
"kind": "Bucket",
420420
"metadata": {
421421
"annotations": {
@@ -588,7 +588,7 @@ kind: XBuckets
588588
metadata:
589589
name: example-buckets
590590
---
591-
apiVersion: s3.aws.upbound.io/v1beta1
591+
apiVersion: s3.aws.m.upbound.io/v1beta1
592592
kind: Bucket
593593
metadata:
594594
annotations:
@@ -603,7 +603,7 @@ spec:
603603
forProvider:
604604
region: us-east-2
605605
---
606-
apiVersion: s3.aws.upbound.io/v1beta1
606+
apiVersion: s3.aws.m.upbound.io/v1beta1
607607
kind: Bucket
608608
metadata:
609609
annotations:
@@ -618,7 +618,7 @@ spec:
618618
forProvider:
619619
region: us-east-2
620620
---
621-
apiVersion: s3.aws.upbound.io/v1beta1
621+
apiVersion: s3.aws.m.upbound.io/v1beta1
622622
kind: Bucket
623623
metadata:
624624
annotations:

0 commit comments

Comments
 (0)