From f8e2f927f6e5bfe2b1da3cfac7380597569bbaa8 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Tue, 19 Aug 2014 22:16:53 -0700 Subject: [PATCH] Pretty up the demo a little. Use images and some better formatting. Also add scripts to help prevent typos. This based on an improved version done by Julia Ferraioli. She came up with the cool images. --- cmd/kubecfg/kubecfg.go | 9 +- examples/update-demo/0-run-web-proxy.sh | 22 ++++ .../1-create-replication-controller.sh | 24 ++++ examples/update-demo/2-scale.sh | 21 ++++ examples/update-demo/3-rolling-update.sh | 26 +++++ examples/update-demo/4-down.sh | 20 ++++ examples/update-demo/README.md | 75 +++++++------ examples/update-demo/image/Dockerfile | 7 -- examples/update-demo/image/data.json | 3 - examples/update-demo/image/default | 23 ---- examples/update-demo/images/base/Dockerfile | 22 ++++ examples/update-demo/images/base/default | 37 +++++++ examples/update-demo/images/build-images.sh | 32 ++++++ examples/update-demo/images/kitten/Dockerfile | 15 +++ .../update-demo/images/kitten/html/data.json | 3 + .../update-demo/images/kitten/html/kitten.jpg | Bin 0 -> 14769 bytes .../update-demo/images/nautilus/Dockerfile | 15 +++ .../images/nautilus/html/data.json | 3 + .../images/nautilus/html/nautilus.jpg | Bin 0 -> 21231 bytes examples/update-demo/local/index.html | 22 ++-- examples/update-demo/local/script.js | 103 +++++++++--------- examples/update-demo/local/style.css | 22 ++-- pkg/kubecfg/kubecfg.go | 5 +- 23 files changed, 375 insertions(+), 134 deletions(-) create mode 100755 examples/update-demo/0-run-web-proxy.sh create mode 100755 examples/update-demo/1-create-replication-controller.sh create mode 100755 examples/update-demo/2-scale.sh create mode 100755 examples/update-demo/3-rolling-update.sh create mode 100755 examples/update-demo/4-down.sh delete mode 100644 examples/update-demo/image/Dockerfile delete mode 100644 examples/update-demo/image/data.json delete mode 100644 examples/update-demo/image/default create mode 100644 examples/update-demo/images/base/Dockerfile create mode 100644 examples/update-demo/images/base/default create mode 100755 examples/update-demo/images/build-images.sh create mode 100644 examples/update-demo/images/kitten/Dockerfile create mode 100644 examples/update-demo/images/kitten/html/data.json create mode 100644 examples/update-demo/images/kitten/html/kitten.jpg create mode 100644 examples/update-demo/images/nautilus/Dockerfile create mode 100644 examples/update-demo/images/nautilus/html/data.json create mode 100644 examples/update-demo/images/nautilus/html/nautilus.jpg diff --git a/cmd/kubecfg/kubecfg.go b/cmd/kubecfg/kubecfg.go index 63793a6806d..9ff29a1e8fe 100644 --- a/cmd/kubecfg/kubecfg.go +++ b/cmd/kubecfg/kubecfg.go @@ -55,7 +55,7 @@ var ( www = flag.String("www", "", "If -proxy is true, use this directory to serve static files") templateFile = flag.String("template_file", "", "If present, load this file as a golang template and use it for output printing") templateStr = flag.String("template", "", "If present, parse this string as a golang template and use it for output printing") - imageName = flag.String("image", "", "Image used when updating a replicationController") + imageName = flag.String("image", "", "Image used when updating a replicationController. Will apply to the first container in the pod template.") ) var parser = kubecfg.NewParser(map[string]interface{}{ @@ -72,11 +72,14 @@ func usage() { kubecfg [OPTIONS] get|list|create|delete|update <%s>[/] Manage replication controllers: - kubecfg [OPTIONS] stop|rm|rollingupdate + kubecfg [OPTIONS] stop|rm kubecfg [OPTIONS] [-u