From b14b04688f27be3b25c796c842e32e496bbc5708 Mon Sep 17 00:00:00 2001 From: Crossplane Date: Wed, 21 Aug 2019 01:40:27 +0000 Subject: [PATCH] docs snapshot for crossplane version `master` --- docs/master/cloud-providers/aws/aws-provider.md | 2 +- docs/master/workloads/aws/wordpress-aws.md | 12 ++++++------ docs/master/workloads/azure/wordpress-azure.md | 10 +++++----- docs/master/workloads/gcp/wordpress-gcp.md | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/master/cloud-providers/aws/aws-provider.md b/docs/master/cloud-providers/aws/aws-provider.md index 103cdfc1..d7aeae73 100644 --- a/docs/master/cloud-providers/aws/aws-provider.md +++ b/docs/master/cloud-providers/aws/aws-provider.md @@ -40,7 +40,7 @@ sed -e "s|BASE64ENCODED_AWS_PROVIDER_CREDS|$(base64 ~/.aws/credentials | tr -d " -e "s|EKS_SECURITY_GROUP|$EKS_SECURITY_GROUP|g" \ -e "s|RDS_SUBNET_GROUP_NAME|$RDS_SUBNET_GROUP_NAME|g" \ -e "s|RDS_SECURITY_GROUP|$RDS_SECURITY_GROUP|g" \ - cluster/examples/workloads/kubernetes/wordpress-aws/provider.yaml | kubectl apply -f - + cluster/examples/workloads/kubernetes/wordpress/aws/provider.yaml | kubectl apply -f - # Clean up after this script by deleting everything it created: # ./cluster/examples/aws-credentials.sh delete 25077 diff --git a/docs/master/workloads/aws/wordpress-aws.md b/docs/master/workloads/aws/wordpress-aws.md index 1da095d6..18c44924 100644 --- a/docs/master/workloads/aws/wordpress-aws.md +++ b/docs/master/workloads/aws/wordpress-aws.md @@ -148,13 +148,13 @@ Now deploy all the workload resources, including the RDS database and EKS cluste Create provider: ```console -sed -e "s|BASE64ENCODED_AWS_PROVIDER_CREDS|`base64 ~/.aws/credentials|tr -d '\n'`|g;s|EKS_WORKER_KEY_NAME|$EKS_WORKER_KEY_NAME|g;s|EKS_ROLE_ARN|$EKS_ROLE_ARN|g;s|REGION|$REGION|g;s|EKS_VPC|$EKS_VPC|g;s|EKS_SUBNETS|$EKS_SUBNETS|g;s|EKS_SECURITY_GROUP|$EKS_SECURITY_GROUP|g;s|RDS_SUBNET_GROUP_NAME|$RDS_SUBNET_GROUP_NAME|g;s|RDS_SECURITY_GROUP|$RDS_SECURITY_GROUP|g" cluster/examples/workloads/kubernetes/wordpress-aws/provider.yaml | kubectl create -f - +sed -e "s|BASE64ENCODED_AWS_PROVIDER_CREDS|`base64 ~/.aws/credentials|tr -d '\n'`|g;s|EKS_WORKER_KEY_NAME|$EKS_WORKER_KEY_NAME|g;s|EKS_ROLE_ARN|$EKS_ROLE_ARN|g;s|REGION|$REGION|g;s|EKS_VPC|$EKS_VPC|g;s|EKS_SUBNETS|$EKS_SUBNETS|g;s|EKS_SECURITY_GROUP|$EKS_SECURITY_GROUP|g;s|RDS_SUBNET_GROUP_NAME|$RDS_SUBNET_GROUP_NAME|g;s|RDS_SECURITY_GROUP|$RDS_SECURITY_GROUP|g" cluster/examples/workloads/kubernetes/wordpress/aws/provider.yaml | kubectl create -f - ``` Create cluster: ```console -kubectl create -f cluster/examples/workloads/kubernetes/wordpress-aws/cluster.yaml +kubectl create -f cluster/examples/workloads/kubernetes/wordpress/cluster.yaml ``` It will take a while (~15 minutes) for the EKS cluster to be deployed and become available. @@ -182,7 +182,7 @@ This section covers tasks performed by an application developer. These include: Now that the EKS cluster is ready, let's begin deploying the workload as the application developer: ```console -kubectl create -f cluster/examples/workloads/kubernetes/wordpress-aws/app.yaml +kubectl create -f cluster/examples/workloads/kubernetes/wordpress/app.yaml ``` This will also take awhile to complete, since the MySQL database needs to be deployed before the WordPress pod can consume it. @@ -274,19 +274,19 @@ kubectl get nodes First delete the workload, which will delete WordPress and the MySQL database: ```console -kubectl delete -f cluster/examples/workloads/kubernetes/wordpress-aws/app.yaml +kubectl delete -f cluster/examples/workloads/kubernetes/wordpress/app.yaml ``` Then delete the EKS cluster: ```console -kubectl delete -f cluster/examples/workloads/kubernetes/wordpress-aws/cluster.yaml +kubectl delete -f cluster/examples/workloads/kubernetes/wordpress/cluster.yaml ``` Finally, delete the provider credentials: ```console -kubectl delete -f cluster/examples/workloads/kubernetes/wordpress-aws/provider.yaml +kubectl delete -f cluster/examples/workloads/kubernetes/wordpress/aws/provider.yaml ``` > Note: There may still be an ELB that was not properly cleaned up, and you will need diff --git a/docs/master/workloads/azure/wordpress-azure.md b/docs/master/workloads/azure/wordpress-azure.md index 3e1b86fe..356954d6 100644 --- a/docs/master/workloads/azure/wordpress-azure.md +++ b/docs/master/workloads/azure/wordpress-azure.md @@ -12,7 +12,7 @@ In this environment, the following components will be dynamically provisioned an Before starting this guide, you should have already [configured your Azure account](../../cloud-providers/azure/azure-provider.md) for usage by Crossplane. - You should have a `crossplane-azure-provider-key.json` file on your local filesystem, preferably at the root of where you cloned the [Crossplane repo](https://github.com/crossplaneio/crossplane). -- You should have a azure resource group with name `group-westus-1`. If not, change the value of `resourceGroupName` to an existing resource group in `cluster/examples/workloads/wordpress-azure/provider.yaml` +- You should have a azure resource group with name `group-westus-1`. If not, change the value of `resourceGroupName` to an existing resource group in `cluster/examples/workloads/wordpress/azure/provider.yaml` @@ -32,13 +32,13 @@ For the next steps, make sure your `kubectl` context points to the cluster where - Create the Azure provider object in your cluster: ```console - sed "s/BASE64ENCODED_AZURE_PROVIDER_CREDS/`base64 crossplane-azure-provider-key.json | tr -d '\n'`/g;" cluster/examples/workloads/wordpress-azure/provider.yaml | kubectl create -f - + sed "s/BASE64ENCODED_AZURE_PROVIDER_CREDS/`base64 crossplane-azure-provider-key.json | tr -d '\n'`/g;" cluster/examples/workloads/wordpress/azure/provider.yaml | kubectl create -f - ``` - Next, create the AKS cluster that will eventually be the target cluster for your Workload deployment: ```console - kubectl create -f cluster/examples/workloads/wordpress-azure/cluster.yaml + kubectl create -f cluster/examples/workloads/wordpress/azure/cluster.yaml ``` It will take a while (~15 minutes) for the AKS cluster to be deployed and becoming ready. You can keep an eye on its status with the following command: @@ -121,11 +121,11 @@ kubectl delete -f cluster/examples/workloads/wordpress-azure/workload.yaml Then delete the AKS cluster: ```console -kubectl delete -f cluster/examples/workloads/wordpress-azure/cluster.yaml +kubectl delete -f cluster/examples/workloads/wordpress/azure/cluster.yaml ``` Finally, delete the provider credentials: ```console -kubectl delete -f cluster/examples/workloads/wordpress-azure/provider.yaml +kubectl delete -f cluster/examples/workloads/wordpress/azure/provider.yaml ``` diff --git a/docs/master/workloads/gcp/wordpress-gcp.md b/docs/master/workloads/gcp/wordpress-gcp.md index 0b54d58d..c62ffbed 100644 --- a/docs/master/workloads/gcp/wordpress-gcp.md +++ b/docs/master/workloads/gcp/wordpress-gcp.md @@ -36,7 +36,7 @@ For the next steps, make sure your `kubectl` context points to the cluster where * Patch and Apply `provider.yaml`: ```bash - sed "s/BASE64ENCODED_GCP_PROVIDER_CREDS/$BASE64ENCODED_GCP_PROVIDER_CREDS/g;s/PROJECT_ID/$PROJECT_ID/g" cluster/examples/workloads/kubernetes/wordpress-gcp/provider.yaml | kubectl create -f - + sed "s/BASE64ENCODED_GCP_PROVIDER_CREDS/$BASE64ENCODED_GCP_PROVIDER_CREDS/g;s/PROJECT_ID/$PROJECT_ID/g" cluster/examples/workloads/kubernetes/wordpress/gcp/provider.yaml | kubectl create -f - ``` * Verify that GCP Provider exists @@ -74,7 +74,7 @@ For the next steps, make sure your `kubectl` context points to the cluster where The `Application Developer(s)` will use the `complex` namespace. ```bash - kubectl apply -f cluster/examples/workloads/kubernetes/wordpress-gcp/cluster.yaml + kubectl apply -f cluster/examples/workloads/kubernetes/wordpress/cluster.yaml ``` * Verify that the Kubernetes Cluster resource was created @@ -121,7 +121,7 @@ Let's begin deploying the workload as the application developer: * Deploy workload ```bash - kubectl apply -f cluster/examples/workloads/kubernetes/wordpress-gcp/app.yaml + kubectl apply -f cluster/examples/workloads/kubernetes/wordpress/app.yaml ``` * Wait for `MySQLInstance` to be in `Bound` State @@ -182,19 +182,19 @@ Once you are done with this example, you can clean up all its artifacts with the * Remove the `App` ```bash - kubectl delete -f cluster/examples/workloads/kubernetes/wordpress-gcp/app.yaml + kubectl delete -f cluster/examples/workloads/kubernetes/wordpress/app.yaml ``` * Remove the `KubernetesCluster` ```bash - kubectl delete -f cluster/examples/workloads/kubernetes/wordpress-gcp/cluster.yaml + kubectl delete -f cluster/examples/workloads/kubernetes/wordpress/cluster.yaml ``` * Remove the GCP `Provider` and Crossplane `ResourceClasses` ```bash - kubectl delete -f cluster/examples/workloads/kubernetes/wordpress-gcp/provider.yaml + kubectl delete -f cluster/examples/workloads/kubernetes/wordpress/gcp/provider.yaml ``` * Delete Google Project