From 573dfab797656563e9a85e6871799c43ffc9f929 Mon Sep 17 00:00:00 2001
From: Anthony Yeh <enisoc@google.com>
Date: Sat, 3 Oct 2015 13:55:58 -0700
Subject: [PATCH] examples/vitess: Update for Vitess v2.0.0-alpha3

Also pin the images on a specific version, since breaking changes are
still possible during alpha.
---
 examples/vitess/guestbook-controller.yaml       | 2 +-
 examples/vitess/vtctld-controller.yaml          | 4 +++-
 examples/vitess/vtgate-controller-template.yaml | 3 ++-
 examples/vitess/vttablet-pod-template.yaml      | 7 ++++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/vitess/guestbook-controller.yaml b/examples/vitess/guestbook-controller.yaml
index c615b559bff..cece7e232d8 100644
--- a/examples/vitess/guestbook-controller.yaml
+++ b/examples/vitess/guestbook-controller.yaml
@@ -12,7 +12,7 @@ spec:
     spec:
       containers:
         - name: guestbook
-          image: vitess/guestbook:v2.0
+          image: vitess/guestbook:v2.0.0-alpha3
           ports:
             - name: http-server
               containerPort: 8080
diff --git a/examples/vitess/vtctld-controller.yaml b/examples/vitess/vtctld-controller.yaml
index be97f073baa..0f86613725a 100644
--- a/examples/vitess/vtctld-controller.yaml
+++ b/examples/vitess/vtctld-controller.yaml
@@ -12,7 +12,7 @@ spec:
     spec:
       containers:
         - name: vtctld
-          image: vitess/lite:v2.0
+          image: vitess/lite:v2.0.0-alpha3
           volumeMounts:
             - name: syslog
               mountPath: /dev/log
@@ -35,8 +35,10 @@ spec:
               -log_dir $VTDATAROOT/tmp
               -alsologtostderr
               -port 15000
+              -service_map 'bsonrpc-vt-vtctl'
               -topo_implementation etcd
               -tablet_protocol grpc
+              -tablet_manager_protocol grpc
               -etcd_global_addrs http://$ETCD_GLOBAL_SERVICE_HOST:$ETCD_GLOBAL_SERVICE_PORT" vitess
       volumes:
         - name: syslog
diff --git a/examples/vitess/vtgate-controller-template.yaml b/examples/vitess/vtgate-controller-template.yaml
index b33a108ccda..98f18d3e135 100644
--- a/examples/vitess/vtgate-controller-template.yaml
+++ b/examples/vitess/vtgate-controller-template.yaml
@@ -12,7 +12,7 @@ spec:
     spec:
       containers:
         - name: vtgate
-          image: vitess/lite:v2.0
+          image: vitess/lite:v2.0.0-alpha3
           volumeMounts:
             - name: syslog
               mountPath: /dev/log
@@ -35,6 +35,7 @@ spec:
               -alsologtostderr
               -port 15001
               -tablet_protocol grpc
+              -service_map 'bsonrpc-vt-vtgateservice'
               -cell test" vitess
       volumes:
         - name: syslog
diff --git a/examples/vitess/vttablet-pod-template.yaml b/examples/vitess/vttablet-pod-template.yaml
index 00b71f17adb..bca3050e454 100644
--- a/examples/vitess/vttablet-pod-template.yaml
+++ b/examples/vitess/vttablet-pod-template.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: vttablet
-      image: vitess/lite:v2.0
+      image: vitess/lite:v2.0.0-alpha3
       volumeMounts:
         - name: syslog
           mountPath: /dev/log
@@ -48,7 +48,8 @@ spec:
           -alsologtostderr
           -port {{port}}
           -grpc_port {{grpc_port}}
-          -service_map 'grpc-queryservice'
+          -service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream'
+          -binlog_player_protocol grpc
           -tablet-path {{alias}}
           -tablet_hostname $(hostname -i)
           -init_keyspace {{keyspace}}
@@ -71,7 +72,7 @@ spec:
           -rowcache-bin /usr/bin/memcached
           -rowcache-socket $VTDATAROOT/{{tablet_subdir}}/memcache.sock" vitess
     - name: mysql
-      image: vitess/lite:v2.0
+      image: vitess/lite:v2.0.0-alpha3
       volumeMounts:
         - name: syslog
           mountPath: /dev/log