From c6b825f846a58cf46b3eddcab1de0d392d0aa88a Mon Sep 17 00:00:00 2001
From: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Date: Tue, 9 Oct 2018 10:52:47 -0700
Subject: [PATCH] Run skaffold fix (#72)

Upgrade skaffold version + manifest.
---
 .travis.yml   |  2 +-
 skaffold.yaml | 49 ++++++++++++++++++++++++-------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c79b0c2..d2db4fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ services:
 - docker
 
 install:
-- curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v0.12.0/skaffold-linux-amd64
+- curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v0.15.1/skaffold-linux-amd64
 - chmod +x skaffold
 - sudo mv skaffold /usr/local/bin
 
diff --git a/skaffold.yaml b/skaffold.yaml
index 9bf9d46..ffa25c2 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v1alpha2
+apiVersion: skaffold/v1alpha3
 kind: Config
 build:
-  tagPolicy:
-    gitCommit: {}
   artifacts:
   - imageName: gcr.io/microservices-demo-app/emailservice
     workspace: src/emailservice
@@ -40,30 +38,31 @@ build:
     workspace: src/loadgenerator
   - imageName: gcr.io/microservices-demo-app/adservice
     workspace: src/adservice
+  tagPolicy:
+    gitCommit: {}
 deploy:
   kubectl:
     manifests:
     - ./kubernetes-manifests/**.yaml
-    
-
 profiles:
-  # "travis-ci" profile is used to build the images without
-  # pushing them.
-  - name: travis-ci
-    build:
-      local:
-        skipPush: true
-  # "gcb" profile allows building and pushing the images
-  # on Google Container Builder without requiring docker
-  # installed on the developer machine. However, note that
-  # since GCB does not cache the builds, each build will
-  # start from scratch and therefore take a long time.
-  #
-  # This is not used by default. To use it, run:
-  #     skaffold run -p gcb
-  - name: gcb
-    build:
-      googleCloudBuild:
-        diskSizeGb: 300
-        machineType: "N1_HIGHCPU_32"
-        timeout: 4000s
+# "travis-ci" profile is used to build the images withou
+# pushing them.
+- name: travis-ci
+  build:
+    local:
+      skipPush: true
+# "gcb" profile allows building and pushing the images
+# on Google Container Builder without requiring docker
+# installed on the developer machine. However, note that
+# since GCB does not cache the builds, each build will
+# start from scratch and therefore take a long time.
+#
+# This is not used by default. To use it, run:
+#     skaffold run -p gcb
+- name: gcb
+  build:
+    googleCloudBuild:
+      projectId: ""
+      diskSizeGb: 300
+      machineType: N1_HIGHCPU_32
+      timeout: 4000s