Merge pull request #959 from negz/plus-one

Update content/master to use v2 stable instead of preview

Author: negz

content/master/cli/_index.md

@@ -27,7 +27,7 @@ To download the latest version for your CPU architecture with the Crossplane
 install script.
 
 ```shell
-curl -sL "https://raw.githubusercontent.com/crossplane/crossplane/main/install.sh" | XP_CHANNEL=preview sh
+curl -sL "https://raw.githubusercontent.com/crossplane/crossplane/main/install.sh" | sh
 ```
 
 [The script](https://raw.githubusercontent.com/crossplane/crossplane/main/install.sh)

content/master/composition/composite-resource-definitions.md

@@ -16,10 +16,10 @@ database configuration of an Azure MySQL Server and some firewall rules. The
 `Composition` contains the 'base' configuration for the MySQL server and the
 firewall rules that the `PlatformDB` configuration extends.
 
-A `Composition` associates with multiple XRs that use it. You might 
-define a `Composition` named `big-platform-db` that's used by ten different 
-`PlatformDB` XRs. Often, in the interest of self-service, a different team manages the `Composition` 
-than the actual `PlatformDB` XRs. For example 
+A `Composition` associates with multiple XRs that use it. You might
+define a `Composition` named `big-platform-db` that's used by ten different
+`PlatformDB` XRs. Often, in the interest of self-service, a different team manages the `Composition`
+than the actual `PlatformDB` XRs. For example
 a platform team member may write and maintain the `Composition`,
 while individual app teams create `PlatformDB` XRs that use said
 `Composition`.
@@ -88,6 +88,7 @@ manually update it when you wish it to use another `CompositionRevision`.
 apiVersion: example.org/v1alpha1
 kind: PlatformDB
 metadata:
+  namespace: default
   name: example
 spec:
   storageGB: 20
@@ -108,6 +109,7 @@ use a different `CompositionRevision`.
 apiVersion: example.org/v1alpha1
 kind: PlatformDB
 metadata:
+  namespace: default
   name: example
 spec:
   storageGB: 20
@@ -125,9 +127,9 @@ spec:
 This tutorial discusses how CompositionRevisions work and how they manage Composite Resource
 (XR) updates. This starts with a `Composition` and `CompositeResourceDefinition` (XRD) that defines a `MyVPC`
 resource and continues with creating multiple XRs to observe different upgrade paths. Crossplane
-assigns different CompositionRevisions to composite resources each time you update the composition. 
+assigns different CompositionRevisions to composite resources each time you update the composition.
 
-### Preparation 
+### Preparation
 
 #### Deploy composition and XRD examples
 Apply the example Composition.
@@ -177,18 +179,18 @@ spec:
     plural: myvpcs
   versions:
   - name: v1alpha1
-    served: true 
-    referenceable: true 
+    served: true
+    referenceable: true
     schema:
       openAPIV3Schema:
-        type: object 
+        type: object
         properties:
           spec:
-            type: object 
+            type: object
             properties:
               id:
-                type: string 
-                description: ID of this VPC that other objects will use to refer to it. 
+                type: string
+                description: ID of this VPC that other objects will use to refer to it.
             required:
             - id
 ```
@@ -228,7 +230,7 @@ spec:
 Expected Output:
 ```shell
 myvpc.aws.example.upbound.io/vpc-auto created
-``` 
+```
 
 #### Manual update policy
 Create a Composite Resource with `compositionUpdatePolicy: Manual` and `compositionRevisionRef`.
@@ -249,7 +251,7 @@ spec:
 Expected Output:
 ```shell
 myvpc.aws.example.upbound.io/vpc-man created
-``` 
+```
 
 #### Using a selector
 Create an XR with a `compositionRevisionSelector` of `channel: dev`:
@@ -269,7 +271,7 @@ spec:
 Expected Output:
 ```shell
 myvpc.aws.example.upbound.io/vpc-dev created
-``` 
+```
 
 Create an XR with a `compositionRevisionSelector` of `channel: staging`:
 ```yaml
@@ -289,9 +291,9 @@ spec:
 Expected Output:
 ```shell
 myvpc.aws.example.upbound.io/vpc-staging created
-``` 
+```
 
-Verify the Composite Resource with the label `channel: staging` doesn't have a `REVISION`.  
+Verify the Composite Resource with the label `channel: staging` doesn't have a `REVISION`.
 All other XRs have a `REVISION` matching the created Composition Revision.
 ```shell
 kubectl get composite -o="custom-columns=NAME:.metadata.name,SYNCED:.status.conditions[0].status,REVISION:.spec.crossplane.compositionRevisionRef.name,POLICY:.spec.crossplane.compositionUpdatePolicy,MATCHLABEL:.spec.crossplane.compositionRevisionSelector.matchLabels"
@@ -303,15 +305,15 @@ vpc-auto      True     myvpcs.aws.example.upbound.io-ad265bc   Automatic   <none
 vpc-dev       True     myvpcs.aws.example.upbound.io-ad265bc   Automatic   map[channel:dev]
 vpc-man       True     myvpcs.aws.example.upbound.io-ad265bc   Manual      <none>
 vpc-staging   False    <none>                                  Automatic   map[channel:staging]
-``` 
+```
 
 {{< hint "note" >}}
 The `vpc-staging` XR label doesn't match any existing Composition Revisions.
 {{< /hint >}}
 
 ### Create new composition revisions
 Crossplane creates a new CompositionRevision when you create or update a Composition. Label and annotation changes
-also trigger a new CompositionRevision. 
+also trigger a new CompositionRevision.
 
 #### Update the composition label
 Update the `Composition` label to `channel: staging`:
@@ -321,7 +323,7 @@ kubectl label composition myvpcs.aws.example.upbound.io channel=staging --overwr
 Expected Output:
 ```shell
 composition.apiextensions.crossplane.io/myvpcs.aws.example.upbound.io labeled
-``` 
+```
 
 Verify that Crossplane creates a new Composition revision:
 ```shell
@@ -332,9 +334,9 @@ Expected Output:
 NAME                                    REVISION   CHANNEL
 myvpcs.aws.example.upbound.io-727b3c8   2          staging
 myvpcs.aws.example.upbound.io-ad265bc   1          dev
-``` 
+```
 
-Verify that Crossplane assigns the Composite Resources `vpc-auto` and `vpc-staging` to Composite `revision:2`.  
+Verify that Crossplane assigns the Composite Resources `vpc-auto` and `vpc-staging` to Composite `revision:2`.
 XRs `vpc-man` and `vpc-dev` are still assigned to the original `revision:1`:
 
 ```shell
@@ -347,10 +349,10 @@ vpc-auto      True     myvpcs.aws.example.upbound.io-727b3c8   Automatic   <none
 vpc-dev       True     myvpcs.aws.example.upbound.io-ad265bc   Automatic   map[channel:dev]
 vpc-man       True     myvpcs.aws.example.upbound.io-ad265bc   Manual      <none>
 vpc-staging   True     myvpcs.aws.example.upbound.io-727b3c8   Automatic   map[channel:staging]
-``` 
+```
 
 {{< hint "note" >}}
-`vpc-auto` always use the latest Revision.  
+`vpc-auto` always use the latest Revision.
 `vpc-staging` now matches the label applied to Revision `revision:2`.
 {{< /hint >}}
 
@@ -393,7 +395,7 @@ spec:
 Expected Output:
 ```shell
 composition.apiextensions.crossplane.io/myvpcs.aws.example.upbound.io configured
-``` 
+```
 
 Verify that Crossplane creates a new Composition revision:
 
@@ -406,13 +408,13 @@ NAME                                    REVISION   CHANNEL
 myvpcs.aws.example.upbound.io-727b3c8   2          staging
 myvpcs.aws.example.upbound.io-ad265bc   1          dev
 myvpcs.aws.example.upbound.io-f81c553   3          dev
-``` 
+```
 
 {{< hint "note" >}}
 Changing the label and the spec values simultaneously is critical for deploying new changes to the `dev` channel.
 {{< /hint >}}
 
-Verify Crossplane assigns the Composite Resources `vpc-auto` and `vpc-dev` to Composite `revision:3`.  
+Verify Crossplane assigns the Composite Resources `vpc-auto` and `vpc-dev` to Composite `revision:3`.
 Crossplane assigns `vpc-staging` to `revision:2`, and still assigns `vpc-man` to the original `revision:1`:
 
 ```shell
@@ -425,7 +427,7 @@ vpc-auto      True     myvpcs.aws.example.upbound.io-f81c553   Automatic   <none
 vpc-dev       True     myvpcs.aws.example.upbound.io-f81c553   Automatic   map[channel:dev]
 vpc-man       True     myvpcs.aws.example.upbound.io-ad265bc   Manual      <none>
 vpc-staging   True     myvpcs.aws.example.upbound.io-727b3c8   Automatic   map[channel:staging]
-``` 
+```
 
 
 {{< hint "note" >}}

content/master/composition/composition-revisions.md

@@ -89,7 +89,7 @@ that supports REST APIs to work with apps.
 This guide requires:
 
 * A Kubernetes cluster with at least 2 GB of RAM
-* The Crossplane v2 preview [installed on the Kubernetes cluster]({{<ref "install">}})
+* Crossplane v2 [installed on the Kubernetes cluster]({{<ref "install">}})
 
 ## Create the custom resource
 

content/master/get-started/get-started-with-composition.md

@@ -32,16 +32,16 @@ Kubernetes calls third party API resources _custom resources_.
 This guide requires:
 
 * A Kubernetes cluster with at least 2 GB of RAM
-* The Crossplane v2 preview [installed on the Kubernetes cluster]({{<ref "install">}})
+* Crossplane v2 [installed on the Kubernetes cluster]({{<ref "install">}})
 * An AWS account with permissions to create an S3 storage bucket
 * AWS [access keys](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-quickstart.html#cli-configure-quickstart-creds)
 
 {{<hint "note">}}
-Only AWS managed resources support the Crossplane v2 preview.
+AWS managed resources fully support Crossplane v2.
 
 <!-- vale gitlab.FutureTense = NO -->
-Maintainers will update the managed resources for other systems including Azure,
-GCP, Terraform, Helm, GitHub, etc to support Crossplane v2 soon.
+Maintainers are actively working to update managed resources for other systems including Azure,
+GCP, Terraform, Helm, GitHub, etc to support Crossplane v2.
 <!-- vale gitlab.FutureTense = YES -->
 {{</hint>}}
 
@@ -69,7 +69,7 @@ kind: Provider
 metadata:
   name: crossplane-contrib-provider-aws-s3
 spec:
-  package: xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v1.24.0-crossplane-v2-preview.0
+  package: xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v2.0.0
 ```
 
 Save this as `provider.yaml` and apply it:
@@ -83,8 +83,8 @@ Check that Crossplane installed the provider:
 ```shell {copy-lines="1",label="getProvider"}
 kubectl get providers
 NAME                                     INSTALLED   HEALTHY   PACKAGE                                                                                     AGE
-crossplane-contrib-provider-family-aws   True        True      xpkg.crossplane.io/crossplane-contrib/provider-family-aws:v1.24.0-crossplane-v2-preview.0   27s
-crossplane-contrib-provider-aws-s3       True        True      xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v1.24.0-crossplane-v2-preview.0       31s
+crossplane-contrib-provider-family-aws   True        True      xpkg.crossplane.io/crossplane-contrib/provider-family-aws:v2.0.0   27s
+crossplane-contrib-provider-aws-s3       True        True      xpkg.crossplane.io/crossplane-contrib/provider-aws-s3:v2.0.0       31s
 ```
 
 {{<hint "note">}}

content/master/get-started/get-started-with-managed-resources.md

@@ -28,14 +28,14 @@ Install Crossplane using the _Helm chart_.
 
 <!-- vale Google.Headings = NO -->
 <!-- vale Microsoft.Headings = NO -->
-### Add the Crossplane Preview Helm repository
+### Add the Crossplane Helm repository
 <!-- vale Google.Headings = YES -->
 <!-- vale Microsoft.Headings = YES -->
 
-Add the Crossplane preview repository with the `helm repo add` command.
+Add the Crossplane stable repository with the `helm repo add` command.
 
 ```shell
-helm repo add crossplane-preview https://charts.crossplane.io/preview
+helm repo add crossplane-stable https://charts.crossplane.io/stable
 ```
 
 Update the
@@ -46,11 +46,11 @@ helm repo update
 
 <!-- vale Google.Headings = NO -->
 <!-- vale Microsoft.Headings = NO -->
-### Install the Crossplane Preview Helm chart
+### Install the Crossplane Helm chart
 <!-- vale Google.Headings = YES -->
 <!-- vale Microsoft.Headings = YES -->
 
-Install the Crossplane Preview Helm chart with `helm install`.
+Install the Crossplane Helm chart with `helm install`.
 
 {{< hint "tip" >}}
 View the changes Crossplane makes to your cluster with the
@@ -63,8 +63,7 @@ Crossplane creates and installs into the `crossplane-system` namespace.
 ```shell
 helm install crossplane \
 --namespace crossplane-system \
---create-namespace crossplane-preview/crossplane \
---version v2.0.0-preview.1
+--create-namespace crossplane-stable/crossplane
 ```
 
 View the installed Crossplane pods with `kubectl get pods -n crossplane-system`.

content/master/get-started/install.md

@@ -10,14 +10,14 @@ The recommended upgrade method for an existing Crossplane install is to use
 * [Helm](https://helm.sh/docs/intro/install/) version `v3.2.0` or later
 
 
-## Add the Crossplane Preview Helm repository
+## Add the Crossplane Helm repository
 Verify Helm has the Crossplane repository.
 
 ```shell
-helm repo add crossplane-preview https://charts.crossplane.io/preview
+helm repo add crossplane-stable https://charts.crossplane.io/stable
 ```
 
-## Update the Helm Preview repository
+## Update the Helm repository
 
 Update the local Crossplane Helm chart with `helm repo update`.
 
@@ -37,7 +37,7 @@ By default, Crossplane installs into the `crossplane-system`
 namespace. 
 
 ```shell
-helm upgrade crossplane --namespace crossplane-system crossplane-preview/crossplane --devel
+helm upgrade crossplane --namespace crossplane-system crossplane-stable/crossplane
 ```
 
 Helm preserves any arguments or flags originally used when installing
@@ -56,5 +56,5 @@ with the upgrade command.
 
 For example, to maintain the original image registry use 
 ```shell 
-helm upgrade crossplane --namespace crossplane-system crossplane-preview/crossplane --set 'args={"--registry=index.docker.io"}'
+helm upgrade crossplane --namespace crossplane-system crossplane-stable/crossplane --set 'args={"--registry=index.docker.io"}'
 ```

content/master/guides/upgrade-crossplane.md

@@ -20,11 +20,11 @@ Examples of managed resources include:
 * Microsoft Azure PostgreSQL `Database` defined in [provider-upjet-azure](https://github.com/crossplane-contrib/provider-upjet-azure).
 
 {{<hint "important">}}
-Only AWS managed resources support the Crossplane v2 preview.
+AWS managed resources fully support Crossplane v2.
 
 <!-- vale gitlab.FutureTense = NO -->
-Maintainers will update the managed resources for other systems including Azure,
-GCP, Terraform, Helm, GitHub, etc to support Crossplane v2 soon.
+Maintainers are actively working to update managed resources for other systems including Azure,
+GCP, Terraform, Helm, GitHub, etc to support Crossplane v2.
 <!-- vale gitlab.FutureTense = YES -->
 {{</hint>}}
 
@@ -419,7 +419,7 @@ For example, when creating an AWS RDS database instance with the Crossplane
 [community AWS provider](https://github.com/crossplane-contrib/provider-aws) 
 generates an endpoint, password, port and username data. The Provider saves
 these variables in the Kubernetes secret 
-{{<hover label="secretname" line="9" >}}rds-secret{{</hover>}}, referenced by
+{{<hover label="secretname" line="10" >}}rds-secret{{</hover>}}, referenced by
 the 
 {{<hover label="secretname" line="9" >}}writeConnectionSecretToRef{{</hover>}}
 field. 
@@ -428,6 +428,7 @@ field.
 apiVersion: database.aws.m.crossplane.io/v1beta1
 kind: RDSInstance
 metadata:
+  namespace: default
   name: my-rds-instance
 spec:
   forProvider:

content/master/managed-resources/managed-resources.md

@@ -216,11 +216,11 @@ Follow [Get Started with Managed Resources]({{<ref "../get-started/get-started-w
 to see how managed resources work.
 
 {{<hint "note">}}
-Only AWS managed resources support the Crossplane v2 preview.
+AWS managed resources fully support Crossplane v2.
 
 <!-- vale gitlab.FutureTense = NO -->
-Maintainers will update the managed resources for other systems including Azure,
-GCP, Terraform, Helm, GitHub, etc to support Crossplane v2 soon.
+Maintainers are actively working to update managed resources for other systems including Azure,
+GCP, Terraform, Helm, GitHub, etc to support Crossplane v2.
 <!-- vale gitlab.FutureTense = YES -->
 {{</hint>}}
 

content/master/whats-crossplane/_index.md

@@ -1,7 +1,7 @@
 ---
 title: What's New in v2?
 weight: 4
-description: Learn what's new in the Crossplane v2 preview
+description: Learn what's new in Crossplane v2
 ---
 **Crossplane v2 makes Crossplane more useful, more intuitive, and less
 opinionated.**
@@ -151,12 +151,11 @@ opinionated about using composition and MRs together. Namespaces enable fine
 grained access control over who can create what MRs.
 
 {{<hint "note">}}
-During the Crossplane v2 preview only namespaced AWS managed resources are
-available.
+Namespaced AWS managed resources are fully available in Crossplane v2.
 
 <!-- vale gitlab.FutureTense = NO -->
-Maintainers will update the managed resources for other systems including Azure,
-GCP, Terraform, Helm, GitHub, etc to support namespaced MRs soon.
+Maintainers are actively working to update managed resources for other systems including Azure,
+GCP, Terraform, Helm, GitHub, etc to support namespaced MRs.
 <!-- vale gitlab.FutureTense = YES -->
 {{</hint>}}