Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add flags to kubernetes guestbook app. #2605

Merged
merged 2 commits into from
Feb 28, 2017
Merged

Add flags to kubernetes guestbook app. #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb32b1
Add flags to kubernetes guestbook app.
thompsonja Feb 28, 2017
578075f
Address comments.
thompsonja Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ples/kubernetes/guestbook-controller.yaml → ...rnetes/guestbook-controller-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ spec:
limits:
memory: "128Mi"
cpu: "100m"
args: ["--port", "{{port}}", "--cell", "{{cell}}", "--vtgate_port", "{{vtgate_port}}"]
2 changes: 0 additions & 2 deletions examples/kubernetes/guestbook-down.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

# This is an example script that stops guestbook.

set -e

script_root=`dirname "${BASH_SOURCE}"`
source $script_root/env.sh

Expand Down
11 changes: 10 additions & 1 deletion examples/kubernetes/guestbook-up.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,20 @@

set -e

port=${GUESTBOOK_PORT:-8080}
cell=${GUESTBOOK_CELL:-"test"}
vtgate_port=${VTGATE_PORT:-15991}

script_root=`dirname "${BASH_SOURCE}"`
source $script_root/env.sh

echo "Creating guestbook service..."
$KUBECTL create --namespace=$VITESS_NAME -f guestbook-service.yaml

sed_script=""
for var in port cell vtgate_port; do
sed_script+="s,{{$var}},${!var},g;"
done

echo "Creating guestbook replicationcontroller..."
$KUBECTL create --namespace=$VITESS_NAME -f guestbook-controller.yaml
sed -e "$sed_script" guestbook-controller-template.yaml | $KUBECTL create --namespace=$VITESS_NAME -f -
17 changes: 13 additions & 4 deletions examples/kubernetes/guestbook/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Main python file."""

import argparse
import os
import time
import json
Expand Down Expand Up @@ -77,13 +78,21 @@ def add_entry(page, value):
def env():
return json.dumps(dict(os.environ))


if __name__ == '__main__':
timeout = 10 # connect timeout in seconds
parser = argparse.ArgumentParser(description='Run guestbook app')
parser.add_argument('--port', help='Port', default=8080, type=int)
parser.add_argument('--cell', help='Cell', default='test', type=str)
parser.add_argument(
'--timeout', help='Connect timeout (s)', default=10, type=int)
parser.add_argument(
'--vtgate_port', help='Vtgate Port', default=15991, type=int)
guestbook_args = parser.parse_args()

# Get vtgate service address from Kubernetes DNS.
addr = 'vtgate-test:15991'
addr = 'vtgate-%s:%d' % (guestbook_args.cell, guestbook_args.vtgate_port)

# Connect to vtgate.
conn = vtgate_client.connect('grpc', addr, timeout)
conn = vtgate_client.connect('grpc', addr, guestbook_args.timeout)

app.run(host='0.0.0.0', port=8080, debug=True)
app.run(host='0.0.0.0', port=guestbook_args.port, debug=True)