update to tutorials

Author: danisla

example-custom-machine-types/README.md

@@ -16,7 +16,7 @@ Install Terraform if it is not already installed (visit [terraform.io](https://t
 ./terraform-install.sh
 ```
 
-## Setup Environment
+## Set up the environment
 
 ```
 cd example-custom-machine-types/
@@ -25,11 +25,12 @@ cd example-custom-machine-types/
 Set the project, replace `YOUR_PROJECT` with your project ID:
 
 ```
-gcloud config set project YOUR_PROJECT
+PROJECT=YOUR_PROJECT
+gcloud config set project ${PROJECT}
 ```
 
 ```
-test -z DEVSHELL_GCLOUD_CONFIG && gcloud auth application-default login
+[[ $CLOUD_SHELL ]] || gcloud auth application-default login
 export GOOGLE_PROJECT=$(gcloud config get-value project)
 ```
 

example-gke-k8s-helm/README.md

@@ -7,28 +7,58 @@
 
 ## Install Terraform
 
-Install Terraform if it is not already installed (visit [terraform.io](https://terraform.io) for other distributions):
+1. Install Terraform if it is not already installed (visit [terraform.io](https://terraform.io) for other distributions):
 
 ```
 ./terraform-install.sh
 ```
 
+## Change to the example directory
+
+```
+cd example-gke-k8s-helm/
+```
+
 ## Set up the environment
 
+1. Set the project, replace `YOUR_PROJECT` with your project ID:
+
 ```
-gcloud auth application-default login
+PROJECT=YOUR_PROJECT
+gcloud config set project ${PROJECT}
+```
+
+2. Configure the environment for Terraform:
+
+```
+[[ $CLOUD_SHELL ]] || gcloud auth application-default login
 export GOOGLE_PROJECT=$(gcloud config get-value project)
 ```
 
+3. Create the terraform.tfvars file:
+
+```
+cat > terraform.tfvars <<EOF
+helm_version = "$(helm version -c --short | egrep -o 'v[0-9].[0-9].[0-9]')"
+acme_email = "$(gcloud config get-value account)"
+EOF
+
+cat terraform.tfvars
+```
+
 ## Enable service management API
 
 This example creates a Cloud Endpoints service and requires that the Service Manangement API is enabled.
 
+1. Enable the Service Management API:
+
 ```
 gcloud services enable servicemanagement.googleapis.com
 ```
 
-## Install helm
+## Install Helm
+
+1. Install the latest version of Helm:
 
 ```
 curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get > get_helm.sh
@@ -38,48 +68,49 @@ chmod 700 get_helm.sh
 helm init --client-only
 ```
 
-## Install the helm provider
-
-```
-wget https://github.com/mcuadros/terraform-provider-helm/releases/download/v0.5.1/terraform-provider-helm_v0.5.1_$(uname | tr '[:upper:]' '[:lower:]')_amd64.tar.gz
-tar -xvf terraform-provider-helm*.tar.gz
-
-mkdir -p ~/.terraform.d/plugins/
-mv terraform-provider-helm*/terraform-provider-helm ~/.terraform.d/plugins/
-```
-
-## Create the `terraform.tfvars` file
+2. Install the Terraform Helm provider:
 
 ```
-cat > terraform.tfvars <<EOF
-helm_version = "$(helm version -c --short | egrep -o 'v[0-9].[0-9].[0-9]')"
-acme_email = "$(gcloud config get-value account)"
-EOF
+(
+  set -x; cd "$(mktemp -d)" &&
+  curl -fsSLO "https://github.com/mcuadros/terraform-provider-helm/releases/download/v0.5.1/terraform-provider-helm_v0.5.1_$(uname | tr '[:upper:]' '[:lower:]')_amd64.tar.gz" &&
+  tar -xvf terraform-provider-helm*.tar.gz &&
+  mkdir -p ~/.terraform.d/plugins/ &&
+  mv terraform-provider-helm*/terraform-provider-helm ~/.terraform.d/plugins/
+)
 ```
 
 ## Run Terraform
 
-If you have run this example before within the last 30 days, undelete the Cloud Endpoints service named `drupal`:
+1. If you have run this example before within the last 30 days, undelete the Cloud Endpoints service named `drupal`:
 
 ```
 gcloud endpoints services undelete drupal.endpoints.$(gcloud config get-value project).cloud.goog
 ```
 
+2. Run Terraform:
+
 ```
 terraform init
-terraform plan
-terraform apply
+terraform plan -out terraform.tfplan
+terraform apply terraform.tfplan
 ```
 
 ## Testing
 
-After the Drupal pods start and are ready, open the interface by navigating to the URL:
+1. Wait for the load balancer to be provisioned:
+
+```
+./test.sh
+```
+
+2. After the Drupal pods start and are ready, open the interface by navigating to the URL:
 
 ```
-echo https://$(terraform output endpoint)
+echo $(terraform output endpoint)
 ```
 
-Login with the credentials displayed in the following commands:
+3. Login with the credentials displayed in the following commands:
 
 ```
 echo User: $(terraform output drupal_user)
@@ -88,19 +119,25 @@ echo Password: $(terraform output drupal_password)
 
 ## Connecting with kubectl and helm
 
+1. Get the cluster credentials and configure kubectl:
+
 ```
 gcloud container clusters get-credentials $(terraform output cluster_name) --zone $(terraform output cluster_zone)
+```
 
+2. Verify kubectl connectivity:
+
+```
 kubectl get pods
 
 helm list
 ```
 
 ## Cleanup
 
-Delete the `nginx-ingress` helm release first so that the forwarding rule and firewall rule are cleaned up by the GCE controller:
+1. Delete the `nginx-ingress` helm release first so that the forwarding rule and firewall rule are cleaned up by the GCE controller:
 
 ```
-terraform destroy -target helm_release.nginx-ingress && sleep 60 && \
+terraform destroy -input=false -auto-approve -target helm_release.nginx-ingress && sleep 60 && \
 terraform destroy
 ```