From c38880047dfec41c63dcc44958c15abd09b21450 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Sat, 15 Nov 2014 19:36:02 -0800 Subject: [PATCH] Update guestbook to fix given recent changes. --- examples/guestbook/php-redis/index.php | 8 ++++---- examples/guestbook/redis-slave/run.sh | 16 +++++++++++++++- hack/e2e-suite/guestbook.sh | 4 ++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/examples/guestbook/php-redis/index.php b/examples/guestbook/php-redis/index.php index 8acba3a5f98..592aa0461d6 100644 --- a/examples/guestbook/php-redis/index.php +++ b/examples/guestbook/php-redis/index.php @@ -12,20 +12,20 @@ if (isset($_GET['cmd']) === true) { if ($_GET['cmd'] == 'set') { $client = new Predis\Client([ 'scheme' => 'tcp', - 'host' => getenv('REDISMASTER_SERVICE_HOST') ?: getenv('SERVICE_HOST'), - 'port' => getenv('REDISMASTER_SERVICE_PORT'), + 'host' => getenv('REDIS_MASTER_SERVICE_HOST') ?: getenv('SERVICE_HOST'), + 'port' => getenv('REDIS_MASTER_SERVICE_PORT'), ]); $client->set($_GET['key'], $_GET['value']); print('{"message": "Updated"}'); } else { - $read_port = getenv('REDISMASTER_SERVICE_PORT'); + $read_port = getenv('REDIS_MASTER_SERVICE_PORT'); if (isset($_ENV['REDISSLAVE_SERVICE_PORT'])) { $read_port = getenv('REDISSLAVE_SERVICE_PORT'); } $client = new Predis\Client([ 'scheme' => 'tcp', - 'host' => getenv('REDISMASTER_SERVICE_HOST') ?: getenv('SERVICE_HOST'), + 'host' => getenv('REDIS_MASTER_SERVICE_HOST') ?: getenv('SERVICE_HOST'), 'port' => $read_port, ]); diff --git a/examples/guestbook/redis-slave/run.sh b/examples/guestbook/redis-slave/run.sh index dec80951e4f..7522baec93d 100755 --- a/examples/guestbook/redis-slave/run.sh +++ b/examples/guestbook/redis-slave/run.sh @@ -1,3 +1,17 @@ #!/bin/bash -redis-server --slaveof ${REDISMASTER_SERVICE_HOST:-$SERVICE_HOST} $REDISMASTER_SERVICE_PORT +# Copyright 2014 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +redis-server --slaveof ${REDIS_MASTER_SERVICE_HOST:-$SERVICE_HOST} $REDIS_MASTER_SERVICE_PORT diff --git a/hack/e2e-suite/guestbook.sh b/hack/e2e-suite/guestbook.sh index c70969d688b..436eb2634a8 100755 --- a/hack/e2e-suite/guestbook.sh +++ b/hack/e2e-suite/guestbook.sh @@ -42,8 +42,8 @@ $KUBECFG stop redisSlaveController # Needed until issue #103 gets fixed sleep 25 $KUBECFG rm redisSlaveController -$KUBECFG delete services/redismaster -$KUBECFG delete pods/redis-master-2 +$KUBECFG delete services/redis-master +$KUBECFG delete pods/redis-master POD_LIST_2=$($KUBECFG '-template={{range.items}}{{.id}} {{end}}' list pods) echo "Pods running after shutdown: ${POD_LIST_2}"