diff --git a/docs/master/cloud-providers/gcp/gcp-provider.md b/docs/master/cloud-providers/gcp/gcp-provider.md index ba386f0d..2cf45204 100644 --- a/docs/master/cloud-providers/gcp/gcp-provider.md +++ b/docs/master/cloud-providers/gcp/gcp-provider.md @@ -28,7 +28,7 @@ $ cluster/examples/gcp-credentials.sh export ORGANIZATION_ID=987654321 export PROJECT_ID=crossplane-example-1234 export EXAMPLE_SA=example-1234@crossplane-example-1234.iam.gserviceaccount.com -export BASE64ENCODED_GCP_PROVIDER_CREDS=$(base64 -w0 crossplane-gcp-provider-key.json) +export BASE64ENCODED_GCP_PROVIDER_CREDS=$(base64 crossplane-gcp-provider-key.json | tr -d "\n") ``` After running `gcp-credentials.sh`, a series of `export` commands will be shown. Copy and paste the `export` commands that are provided. These variable names will be referenced throughout the Crossplane examples, generally with a `sed` command. diff --git a/docs/master/gitlab/gitlab-aws.md b/docs/master/gitlab/gitlab-aws.md index 38de55ee..c69a63e4 100644 --- a/docs/master/gitlab/gitlab-aws.md +++ b/docs/master/gitlab/gitlab-aws.md @@ -46,7 +46,7 @@ aws eks --region $REGION update-kubeconfig --name [your-CLUSTER_NAME] Create provider: ```console -sed -e "s|REGION|$REGION|g;s|BASE64ENCODED_AWS_PROVIDER_CREDS|`cat ~/.aws/credentials|base64|tr -d '\n'`|g;" cluster/examples/gitlab/aws/provider.yaml | kubectl create -f - +sed -e "s|REGION|$REGION|g;s|BASE64ENCODED_AWS_PROVIDER_CREDS|`base64 ~/.aws/credentials | tr -d '\n'`|g;" cluster/examples/gitlab/aws/provider.yaml | kubectl create -f - ``` - Verify AWS provider was successfully registered by the crossplane diff --git a/docs/master/gitlab/gitlab-gcp.md b/docs/master/gitlab/gitlab-gcp.md index ec7224a5..6bcee74c 100644 --- a/docs/master/gitlab/gitlab-gcp.md +++ b/docs/master/gitlab/gitlab-gcp.md @@ -45,8 +45,7 @@ It is essential to make sure that the GCP Service Account used by the Crossplane Using GCP Service Account `gcp-credentials.json`: - Generate BASE64ENCODED_GCP_PROVIDER_CREDS encoded value: ```bash -cat gcp-credentials.json | base64 -#cat gcp-credentials.json | base64 -w0 # linux variant +base64 gcp-credentials.json | tr -d "\n" ``` - Update [provider.yaml](../../cluster/examples/gitlab/gcp/provider.yaml) replacing `BASE64ENCODED_GCP_PROVIDER_CREDS` @@ -58,7 +57,7 @@ It is recommended to create a separate GCP Service Account dedicated to storage Follow the same step as for GCP credentials to create and obtain `gcs-credentials.json` - Generate BASE64ENCODED_GCS_PROVIDER_CREDS encoded value: ```bash -cat gcs-credentials.json | base64 -w0 +base64 gcs-credentials.json | tr -d "\n" ``` Otherwise, you can use `BASE64ENCODED_GCP_PROVIDER_CREDS` in place of `BASE64ENCODED_GCS_PROVIDER_CREDS` diff --git a/docs/master/postgresql.md b/docs/master/postgresql.md index 1d5efaac..42f118ae 100644 --- a/docs/master/postgresql.md +++ b/docs/master/postgresql.md @@ -56,7 +56,7 @@ Let's create a `ResourceClass` that acts as a "blueprint" that contains the envi This is a task that the administrator should complete, since they will have the knowledge and privileges for the specific environment details. ```console -sed "s/BASE64ENCODED_${PROVIDER}_PROVIDER_CREDS/`cat ${PROVIDER_KEY_FILE}|base64|tr -d '\n'`/g;" cluster/examples/database/${provider}/postgresql/provider.yaml | kubectl create -f - +sed "s/BASE64ENCODED_${PROVIDER}_PROVIDER_CREDS/`base64 ${PROVIDER_KEY_FILE} | tr -d '\n'`/g;" cluster/examples/database/${provider}/postgresql/provider.yaml | kubectl create -f - kubectl create -f cluster/examples/database/${provider}/postgresql/resource-class.yaml ``` diff --git a/docs/master/workloads/azure/wordpress-azure.md b/docs/master/workloads/azure/wordpress-azure.md index c71ebac8..3e1b86fe 100644 --- a/docs/master/workloads/azure/wordpress-azure.md +++ b/docs/master/workloads/azure/wordpress-azure.md @@ -32,7 +32,7 @@ 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/`cat crossplane-azure-provider-key.json|base64|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: diff --git a/docs/master/workloads/gcp/wordpress-gcp.md b/docs/master/workloads/gcp/wordpress-gcp.md index 4bc9c449..92e14884 100644 --- a/docs/master/workloads/gcp/wordpress-gcp.md +++ b/docs/master/workloads/gcp/wordpress-gcp.md @@ -30,7 +30,7 @@ For the next steps, make sure your `kubectl` context points to the cluster where ```bash export PROJECT_ID=[your-demo-project-id] - export BASE64ENCODED_GCP_PROVIDER_CREDS=$(base64 -w0 crossplane-gcp-provider-key.json) + export BASE64ENCODED_GCP_PROVIDER_CREDS=$(base64 crossplane-gcp-provider-key.json | tr -d "\n") ``` * Patch and Apply `provider.yaml`: