From d9325edf3b1adf04046a815a6091c04da3c1570a Mon Sep 17 00:00:00 2001
From: Dave Stanke <davidstanke@gmail.com>
Date: Fri, 30 Nov 2018 18:56:01 -0500
Subject: [PATCH] Use skaffold builder from k8s-skaffold registry

---
 README.md       | 23 ++++++++---------------
 cloudbuild.yaml | 49 ++++++++++++++-----------------------------------
 2 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index dd510e1..623046f 100644
--- a/README.md
+++ b/README.md
@@ -103,24 +103,17 @@ Find **Protocol Buffers Descriptions** at the [`./pb` directory](./pb).
 
         kubectl get nodes
 
-2. Enable Google Container Registry (GCR) on your GCP project and configure the
+1. Enable Google Container Registry (GCR) on your GCP project and configure the
    `docker` CLI to authenticate to GCR:
 
        gcloud services enable containerregistry.googleapis.com
 
        gcloud auth configure-docker -q
 
-3. Set your project ID on image names:
-
-    - Edit `skaffold.yaml`, update the `imageName:` fields that look like
-      `gcr.io/[PROJECT_ID]` with your own GCP project ID.
-
-    - Similarly, edit all Kubernetes Deployment manifests in the
-      [`./kubernetes-manifests`](./kubernetes-manifests) directory. Find the
-      `image:` fields with `gcr.io/[...]` and change them to your own GCP project
-      ID.
-
-5. Run `skaffold run` from the root of this repository. This command:
+1. In the root of this repository, run `skaffold run --default-repo=gcr.io/[PROJECT_ID]`,
+   where [PROJECT_ID] is your GCP project ID.
+   
+   This command:
    - builds the container images
    - pushes them to GCR
    - applies the `./kubernetes-manifests` deploying the application to
@@ -128,9 +121,9 @@ Find **Protocol Buffers Descriptions** at the [`./pb` directory](./pb).
 
    **Troubleshooting:** If you get "No space left on device" error on Google Cloud Shell,
    you can build the images on Google Cloud Build:
-   [Enable the Cloud Build API](https://console.cloud.google.com/flows/enableapi?apiid=cloudbuild.googleapis.com), then run `skaffold run -p gcb` instead.
+   [Enable the Cloud Build API](https://console.cloud.google.com/flows/enableapi?apiid=cloudbuild.googleapis.com), then run `skaffold run -p gcb  --default-repo=gcr.io/[PROJECT_ID]` instead.
 
-6.  Find the IP address of your application, then visit the application on your
+1.  Find the IP address of your application, then visit the application on your
     browser to confirm installation.
 
         kubectl get service frontend-external
@@ -168,7 +161,7 @@ Find **Protocol Buffers Descriptions** at the [`./pb` directory](./pb).
 
     This is required only once.
 
-5. Deploy the application with `skaffold run`.
+5. Deploy the application with `skaffold run --default-repo=gcr.io/[PROJECT_ID]`.
 
 6. Run `kubectl get pods` to see pods are in a healthy and ready state.
 
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 032be39..bb02f74 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,44 +1,23 @@
 # Cloudbuild.yaml to deploy to staging
 #
 # PREREQUISITES:
-# - Cloud Build service account must have roles: "Kubernetes Engine Developer", "Storage Object Creator", \
-#   "Storage Object"
+# - Cloud Build service account must have roles: "Kubernetes Engine 
+# Developer", "Storage Object Creator", "Storage Object"
+
+# USAGE:
+# GCP zone and GKE target cluster must be specified as substitutions
+# Example invocation:
+# `gcloud builds submit --config=cloudbuild.yaml --substitutions=_ZONE=us-central1-b,_CLUSTER=demo-app-staging .`
 
 steps:
-
-# authenticate to GKE cluster
-- id: 'Get GKE credentials'
-  name: gcr.io/cloud-builders/gcloud
-  args: ['container','clusters','get-credentials','demo-app-staging']
-  env:
-  - 'CLOUDSDK_COMPUTE_ZONE=us-central1-b'
-
-# make latest version of the Skaffold community builder available in this project
-- id: 'clone community builders repo'
-  name: gcr.io/cloud-builders/git
-  args: ['clone','https://github.com/GoogleCloudPlatform/cloud-builders-community']
-
-- id: 'build Skaffold builder'
-  name: gcr.io/cloud-builders/docker
+- id: 'Deploy to app'
+  name: 'gcr.io/k8s-skaffold/skaffold'
+  entrypoint: 'bash'
   args: 
-    [
-      'build',
-      '--tag', 'skaffold',
-      '/workspace/cloud-builders-community/skaffold/.',
-    ]
-
-# push app code to cluster
-- id: 'Deploy to staging'
-  name: skaffold
-  args: 
-    [
-      'run', 
-      '-f=skaffold.yaml',
-      '--default-repo','gcr.io/$PROJECT_ID',
-    ]
-  env:
-  - 'CLOUDSDK_COMPUTE_ZONE=us-central1-b'
-  - 'CLOUDSDK_CONTAINER_CLUSTER=demo-app-staging'
+  - '-c'
+  - > 
+    gcloud container clusters get-credentials --zone=$_ZONE $_CLUSTER;
+    skaffold run -f=skaffold.yaml --default-repo=gcr.io/$PROJECT_ID;
 
 # Add more power, and more time, for heavy Skaffold build
 timeout: '3600s'