Merge lp:~mbruzek/charms/trusty/kubernetes-master/v1.0.0 into lp:~kubernetes/charms/trusty/kubernetes-master/trunk

[Matt Bruzek]

[Matt Bruzek (mbruzek)]

Vendoring the changes for the v1.0.0 kubernetes release

[Charles Butler (lazypower)]

Fix the dual shebang in the install hook and +1 LGTM

review: Approve

[lp:~mbruzek/charms/trusty/kubernetes-master/v1.0.0]

9. By Matt Bruzek on 2015-07-17

Code review found double shebang in install.py removing it.

=== removed file 'cli.txt'
--- cli.txt	2015-01-27 17:59:40 +0000
+++ cli.txt	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-API Server
-----------
-./apiserver -h
-Usage of ./apiserver:
-  -address=127.0.0.1: The IP address on to serve on (set to 0.0.0.0 for all interfaces)
-  -allow_privileged=false: If true, allow privileged containers.
-  -alsologtostderr=false: log to standard error as well as files
-  -api_prefix="/api": The prefix for API requests on the server. Default '/api'.
-  -cloud_config="": The path to the cloud provider configuration file.  Empty string for no configuration file.
-  -cloud_provider="": The provider for cloud services.  Empty string for no provider.
-  -cors_allowed_origins=[]: List of allowed origins for CORS, comma separated.  An allowed origin can be a regular expression to support subdomain matching.  If this list is empty CORS will not be enabled.
-  -enable_logs_support=true: Enables server endpoint for log collection
-  -etcd_config="": The config file for the etcd client. Mutually exclusive with -etcd_servers.
-  -etcd_servers=[]: List of etcd servers to watch (http://ip:port), comma separated. Mutually exclusive with -etcd_config
-  -event_ttl=48h0m0s: Amount of time to retain events. Default 2 days.
-  -health_check_minions=true: If true, health check minions and filter unhealthy ones. Default true.
-  -log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-  -log_dir="": If non-empty, write log files in this directory
-  -log_flush_frequency=5s: Maximum number of seconds between log flushes
-  -logtostderr=false: log to standard error instead of files
-  -machines=[]: List of machines to schedule onto, comma separated.
-  -minion_cache_ttl=30s: Duration of time to cache minion information. Default 30 seconds.
-  -minion_port=10250: The port at which kubelet will be listening on the minions.
-  -minion_regexp="": If non empty, and -cloud_provider is specified, a regular expression for matching minion VMs.
-  -node_memory=3221225472: The amount of memory (in bytes) provisioned on each node
-  -node_milli_cpu=1000: The amount of MilliCPU provisioned on each node
-  -port=8080: The port to listen on. Default 8080
-  -stderrthreshold=0: logs at or above this threshold go to stderr
-  -storage_version="": The version to store resources with. Defaults to server preferred
-  -token_auth_file="": If set, the file that will be used to secure the API server via token authentication.
-  -v=0: log level for V logs
-  -version=false: Print version information and quit
-  -vmodule=: comma-separated list of pattern=N settings for file-filtered logging
-
-Controller
-----------
-
-./controller-manager -h
-Usage of ./controller-manager:
-  -address=127.0.0.1: The IP address to serve on (set to 0.0.0.0 for all interfaces)
-  -alsologtostderr=false: log to standard error as well as files
-  -api_version="": The API version to use when talking to the server
-  -certificate_authority="": Path to a cert. file for the certificate authority
-  -client_certificate="": Path to a client key file for TLS.
-  -client_key="": Path to a client key file for TLS.
-  -insecure_skip_tls_verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
-  -log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-  -log_dir="": If non-empty, write log files in this directory
-  -log_flush_frequency=5s: Maximum number of seconds between log flushes
-  -logtostderr=false: log to standard error instead of files
-  -master="": The address of the Kubernetes API server
-  -port=10252: The port that the controller-manager's http service runs on
-  -stderrthreshold=0: logs at or above this threshold go to stderr
-  -v=0: log level for V logs
-  -version=false: Print version information and quit
-  -vmodule=: comma-separated list of pattern=N settings for file-filtered logging
-
-
-Scheduler
----------
-
-./scheduler -h
-Usage of ./scheduler:
-  -address=127.0.0.1: The IP address to serve on (set to 0.0.0.0 for all interfaces)
-  -alsologtostderr=false: log to standard error as well as files
-  -api_version="": The API version to use when talking to the server
-  -certificate_authority="": Path to a cert. file for the certificate authority
-  -client_certificate="": Path to a client key file for TLS.
-  -client_key="": Path to a client key file for TLS.
-  -insecure_skip_tls_verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
-  -log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-  -log_dir="": If non-empty, write log files in this directory
-  -log_flush_frequency=5s: Maximum number of seconds between log flushes
-  -logtostderr=false: log to standard error instead of files
-  -master="": The address of the Kubernetes API server
-  -port=10251: The port that the scheduler's http service runs on
-  -stderrthreshold=0: logs at or above this threshold go to stderr
-  -v=0: log level for V logs
-  -version=false: Print version information and quit
-  -vmodule=: comma-separated list of pattern=N settings for file-filtered logging

=== modified file 'config.yaml'
--- config.yaml	2015-04-10 21:12:25 +0000
+++ config.yaml	2015-07-17 20:13:36 +0000
@@ -1,7 +1,7 @@
 options:
   version:
     type: string
-    default: "v0.8.1"
+    default: "v1.0.0"
     description: |
         The kubernetes release to use in this charm. The binary files are
         compiled from the source identified by this tag in github. Using the

=== modified file 'copyright'
--- copyright	2015-01-27 17:59:40 +0000
+++ copyright	2015-07-17 20:13:36 +0000
@@ -1,13 +1,13 @@
-Copyright 2015 Canonical LTD
+Copyright 2015 Canonical Ltd.
 
 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
+     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.
+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.

=== removed directory 'docs'
=== removed file 'docs/1-getting-started.md'
--- docs/1-getting-started.md	2015-01-27 17:59:40 +0000
+++ docs/1-getting-started.md	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-# Getting Started
-
-## Environment Considerations
-
-Kubernetes has specific cloud provider integration, and as of the current writing of this document that supported list includes the official Juju supported providers:
-
-- [Amazon AWS](https://jujucharms.com/docs/config-aws)
-- [Azure](https://jujucharms.com/docs/config-azure)
-- [Vagrant](https://jujucharms.com/docs/config-vagrant)
-
-Other providers available for use as a *juju manual environment* can be listed in the [Kubernetes Documentation](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs/getting-started-guides)
-
-## Deployment
-
-The Kubernetes Charms are currently under heavy development. We encourage you to fork these charms and contribute back to the development effort! See our [contributing](contributing.md) doc for more information on this.
-
-#### Deploying the Preview Release charms
-
-    juju deploy cs:~hazmat/trusty/etcd
-    juju deploy cs:~hazmat/trusty/flannel
-    juju deploy local:trusty/kubernetes-master
-    juju deploy local:trusty/kubernetes
-
-    juju add-relation etcd flannel
-    juju add-relation etcd kubernetes
-    juju add-relation etcd kubernetes-master
-    juju add-relation kubernetes kubernetes-master
-
-#### Deploying the Development Release Charms
-
-> These charms are known to be unstable as they are tracking the current efforts of the community at enabling different features against Kubernetes. This includes the specifics for integration per cloud environment, and upgrading to the latest development version.
-
-    mkdir -p ~/charms/trusty
-    git clone https://github.com/whitmo/kubernetes-master.git ~/charms/trusty/kubernetes-master
-    git clone https://github.com/whitmo/kubernetes.git ~/charms/trusty/kubernetes
-
-##### Skipping the manual deployment after git clone
-
-> **Note:** This path requires the pre-requisite of juju-deployer. You can obtain juju-deployer via `apt-get install juju-deployer`
-
-    wget https://github.com/whitmo/bundle-kubernetes/blob/master/develop.yaml kubernetes-devel.yaml
-    juju-deployer kubernetes-devel.yaml
-
-
-## Verifying Deployment with the Kubernetes Agent
-
-You'll need the kubernetes command line client to utlize the created cluster. And this can be fetched from the [Releases](https://github.com/GoogleCloudPlatform/kubernetes/releases) page on the Kubernetes project. Make sure you're fetching a client library that matches what the charm is deploying.
-
-Grab the tarball and from the extracted release you can just directly use the cli binary at ./kubernetes/platforms/linux/amd64/kubecfg
-
-You'll need the address of the kubernetes master as environment variable :
-
-    juju status kubernetes-master/0
-
-Grab the public-address there and export it as KUBERNETES_MASTER environment variable :
-
-    export KUBERNETES_MASTER=$(juju status --format=oneline kubernetes-master | cut -d' ' -f3):8080
-
-And now you can run through the kubernetes examples per normal. :
-
-    kubecfg list minions
-
-
-## Scale Up
-
-If the default capacity of the bundle doesn't provide enough capacity for your workload(s) you can scale horizontially by adding a unit to the flannel and kubernetes services respectively.
-
-    juju add-unit flannel
-    juju add-unit kubernetes --to # (machine id of new flannel unit)
-
-## Known Issues / Limitations
-
-Kubernetes currently has platform specific functionality. For example load balancers and persistence volumes only work with the google compute provider atm.
-
-The Juju integration uses the kubernetes null provider. This means external load balancers and storage can't be directly driven through kubernetes config files.
-
-## Where to get help
-
-If you run into any issues, file a bug at our [issue tracker](http://github.com/whitmo/kubernetes-charm/issues), email the Juju Mailing List at <[e-mail]>, or feel free to join us in #juju on irc.freenode.net.
-
-

=== removed file 'docs/contributing.md'
--- docs/contributing.md	2015-01-27 17:59:40 +0000
+++ docs/contributing.md	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-
-#### Contributions are welcome, in any form. Whether that be Bugs, BugFixes, Documentation, or Features.
-
-### Submitting a bug
-
-1. Go to our [issue tracker](http://github.com/whitmo/kubernetes-master-charm/issues) on GitHub
-2. Search for existing issues using the search field at the top of the page
-3. File a new issue including the info listed below
-4. Thanks a ton for helping make the Kubernetes-Master Charm higher quality!
-
-##### When filing a new bug, please include:
-
-- **Descriptive title** - use keywords so others can find your bug (avoiding duplicates)
-- **Steps to trigger the problem** - that are specific, and repeatable
-- **What happens** - when you follow the steps, and what you expected to happen instead.
-- Include the exact text of any error messages if applicable (or upload screenshots).
-- Kubernetes-Master Charm version (or if you're pulling directly from Git, your current commit SHA - use git rev-parse HEAD) and the Juju Version output from `juju --version`.
-- Did this work in a previous charm version? If so, also provide the version that it worked in.
-- Any errors logged in `juju debug log` Console view
-
-### Can I help fix a bug?
-
-Yes please! But first...
-
-- Make sure no one else is already working on it -- if the bug has a milestone assigned or is tagged 'fix in progress', then it's already under way. Otherwise, post a comment on the bug to let others know you're starting to work on it.
-
-We use the Fork & Pull model for distributed development. For a more in-depth overview: consult with the github documentation on [Collaborative Development Models](https://help.github.com/articles/using-pull-requests/#before-you-begin).
-
-> ##### Fork & pull
->
-> The fork & pull model lets anyone fork an existing repository and push changes to their personal fork without requiring access be granted to the source repository. The changes must then be pulled into the source repository by the project maintainer. This model reduces the amount of friction for new contributors and is popular with open source projects because it allows people to work independently without upfront coordination.
-
-### Submitting a Bug Fix
-
-The following checklist will help developers not familiar with the fork and pull process of development. We appreciate your enthusiasm to make the Kubernetes-Master Charm a High Quality experience! To Rapidly get started - follow the 8 steps below.
-
-1. [Fork the repository](https://help.github.com/articles/fork-a-repo/)
-2. Clone your fork `git clone [e-mail]/myusername/kubernetes-master-charm.git`
-3. Checkout your topic branch with `git checkout -b my-awesome-bugfix`
-4. Hack away at your feature/bugfix
-5. Validate your bugfix if possible in the amulet test(s) so we dont reintroduce it later.
-6. Validate your code meets guidelines by passing lint tests `make lint`
-6. Commit code `git commit -a -m 'i did all this work to fix #32'`
-7. Push your branch to your forks remote branch `git push origin my-awesome-bugfix`
-8. Create the [Pull Request](https://help.github.com/articles/using-pull-requests/#initiating-the-pull-request)
-9. Await Code Review
-10. Rejoice when Pull Request is accepted
-
-### Submitting a Feature
-
-The Steps are the same as [Submitting a Bug Fix](#submitting-a-bug-fix). If you want extra credit, make sure you [File an issue](http://github.com/whitmo/kubernetes-master-charm/issues) that covers the Feature you are working on - as kind of a courtesy heads up. And assign the issue to yourself so we know you are working on it.
-

=== modified file 'files/apiserver.upstart.tmpl'
--- files/apiserver.upstart.tmpl	2015-04-10 21:12:25 +0000
+++ files/apiserver.upstart.tmpl	2015-07-17 20:13:36 +0000
@@ -11,7 +11,7 @@
      --address=%(api_bind_address)s \
      --etcd_servers=%(etcd_servers)s \
      --logtostderr=true \
-     --portal_net=10.244.240.0/20
+     --service-cluster-ip-range=10.244.240.0/20
 
 
 

=== removed file 'files/create_kubernetes_tar.sh'
--- files/create_kubernetes_tar.sh	2015-01-27 17:59:40 +0000
+++ files/create_kubernetes_tar.sh	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# This script downloads a Kubernetes release and creates a tar file with only
-# the files that are needed for this charm.
-
-# Usage: create_kubernetes_tar.sh VERSION ARCHITECTURE
-
-usage() {
-  echo "Build a tar file with only the files needed for the kubernetes charm."
-  echo "The script accepts two arguments version and desired architecture."
-  echo "$0 version architecture"
-}
-
-download_kubernetes() {
-  local VERSION=$1
-  URL_PREFIX="https://github.com/GoogleCloudPlatform/kubernetes"
-  KUBERNETES_URL="${URL_PREFIX}/releases/download/${VERSION}/kubernetes.tar.gz"
-  # Remove the previous temporary files to remain idempotent.
-  if [ -f /tmp/kubernetes.tar.gz ]; then
-    rm /tmp/kubernetes.tar.gz
-  fi
-  # Download the kubernetes release from the Internet.
-  wget --no-verbose --tries 2 -O /tmp/kubernetes.tar.gz $KUBERNETES_URL
-}
-
-extract_kubernetes() {
-  local ARCH=$1
-  # Untar the kubernetes release file.
-  tar -xvzf /tmp/kubernetes.tar.gz -C /tmp
-  # Untar the server linux amd64 package.
-  tar -xvzf /tmp/kubernetes/server/kubernetes-server-linux-$ARCH.tar.gz -C /tmp
-}
-
-create_charm_tar() {
-  local OUTPUT_FILE=${1:-"$PWD/kubernetes.tar.gz"}
-  local OUTPUT_DIR=`dirname $OUTPUT_FILE`
-  if [ ! -d $OUTPUT_DIR ]; then
-    mkdir -p $OUTPUT
-  fi
-
-  # Change to the directory the binaries are.
-  cd /tmp/kubernetes/server/bin/
-
-  # Create a tar file with the binaries that are needed for kubernetes master.
-  tar -cvzf $OUTPUT_FILE kube-apiserver kube-controller-manager kubectl kube-scheduler
-}
-
-if [ $# -gt 2 ]; then
-  usage
-  exit 1
-fi
-VERSION=${1:-"v0.8.1"}
-ARCH=${2:-"amd64"}
-download_kubernetes $VERSION
-extract_kubernetes $ARCH
-TAR_FILE="$PWD/kubernetes-master-$VERSION-$ARCH.tar.gz"
-create_charm_tar $TAR_FILE

=== modified file 'files/distribution.conf.tmpl'
--- files/distribution.conf.tmpl	2015-04-10 21:12:25 +0000
+++ files/distribution.conf.tmpl	2015-07-17 20:13:36 +0000
@@ -1,6 +1,6 @@
 server {
     listen %(api_bind_address)s:80;
     location %(web_uri)s {
-        alias /opt/kubernetes/_output/local/bin/linux/amd64/;
+        alias %(alias)s;
     }
 }

=== modified file 'hooks/__init__.py'
--- hooks/__init__.py	2015-04-10 21:12:25 +0000
+++ hooks/__init__.py	2015-07-17 20:13:36 +0000
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-04-10 21:12:25 +0000
+++ hooks/hooks.py	2015-07-17 20:13:36 +0000
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+
 """
 The main hook file is called by Juju.
 """
@@ -44,46 +45,54 @@
     config = hookenv.config()
     # Get the version of kubernetes to install.
     version = config['version']
-    # Get the package architecture, rather than the from the kernel (uname -m).
-    arch = subprocess.check_output(['dpkg', '--print-architecture']).strip()
-    kubernetes_dir = path('/opt/kubernetes')
-    if not kubernetes_dir.exists():
-        print('The source directory {0} does not exist'.format(kubernetes_dir))
-        print('Was the kubernetes code cloned during install?')
-        exit(1)
 
-    if version in ['source', 'head', 'master']:
+    if version == 'master':
+        # The 'master' branch of kuberentes is used when master is configured.
         branch = 'master'
+    elif version == 'local':
+        # Check for kubernetes binaries in the local files/output directory.
+        branch = None
     else:
-        # Create a branch to a tag.
+        # Create a branch to a tag to get the release version.
         branch = 'tags/{0}'.format(version)
 
-    # Construct the path to the binaries using the arch.
-    output_path = kubernetes_dir / '_output/local/bin/linux' / arch
-    installer = KubernetesInstaller(arch, version, output_path)
-
-    # Change to the kubernetes directory (git repository).
-    with kubernetes_dir:
-        # Create a command to get the current branch.
-        git_branch = 'git branch | grep "\*" | cut -d" " -f2'
-        current_branch = subprocess.check_output(git_branch, shell=True).strip()
-        print('Current branch: ', current_branch)
-        # Create the path to a file to indicate if the build was broken.
-        broken_build = charm_dir / '.broken_build'
-        # write out the .broken_build file while this block is executing.
-        with check_sentinel(broken_build) as last_build_failed:
-            print('Last build failed: ', last_build_failed)
-            # Rebuild if the current version is different or last build failed.
-            if current_branch != version or last_build_failed:
-                installer.build(branch)
-        if not output_path.exists():
-            broken_build.touch()
-        else:
-            print('Notifying minions of verison ' + version)
-            # Notify the minions of a version change.
-            for r in hookenv.relation_ids('minions-api'):
-                hookenv.relation_set(r, version=version)
-            print('Done notifing minions of version ' + version)
+    # Get the package architecture, rather than arch from the kernel (uname -m).
+    arch = subprocess.check_output(['dpkg', '--print-architecture']).strip()
+
+    if not branch:
+        output_path = charm_dir / 'files/output'
+        installer = KubernetesInstaller(arch, version, output_path)
+    else:
+
+        # Build the kuberentes binaries from source on the units.
+        kubernetes_dir = path('/opt/kubernetes')
+
+        # Construct the path to the binaries using the arch.
+        output_path = kubernetes_dir / '_output/local/bin/linux' / arch
+        installer = KubernetesInstaller(arch, version, output_path)
+
+        if not kubernetes_dir.exists():
+            print('The source directory {0} does not exist'.format(kubernetes_dir))
+            print('Was the kubernetes code cloned during install?')
+            exit(1)
+
+        # Change to the kubernetes directory (git repository).
+        with kubernetes_dir:
+
+            # Create a command to get the current branch.
+            git_branch = 'git branch | grep "\*" | cut -d" " -f2'
+            current_branch = subprocess.check_output(git_branch, shell=True).strip()
+            print('Current branch: ', current_branch)
+            # Create the path to a file to indicate if the build was broken.
+            broken_build = charm_dir / '.broken_build'
+            # write out the .broken_build file while this block is executing.
+            with check_sentinel(broken_build) as last_build_failed:
+                print('Last build failed: ', last_build_failed)
+                # Rebuild if current version is different or last build failed.
+                if current_branch != version or last_build_failed:
+                    installer.build(branch)
+            if not output_path.isdir():
+                broken_build.touch()
 
     # Create the symoblic links to the right directories.
     installer.install()
@@ -127,6 +136,12 @@
     notify_minions()
 
 
[e-mail]('network-relation-changed')
+def network_relation_changed():
+    relation_id = hookenv.relation_id()
+    hookenv.relation_set(relation_id, ignore_errors=True)
+
+
 def notify_minions():
     print("Notify minions.")
     config = hookenv.config()
@@ -136,11 +151,13 @@
             hostname=hookenv.unit_private_ip(),
             port=8080,
             version=config['version'])
+    print("Notified minions of version " + config['version'])
 
 
 def get_template_data():
     rels = hookenv.relations()
     config = hookenv.config()
+    version = config['version']
     template_data = {}
     template_data['etcd_servers'] = ",".join([
         "http://%s:%s" % (s[0], s[1]) for s in sorted(
@@ -152,8 +169,14 @@
     template_data['api_server_address'] = "http://%s:%s" % (
         hookenv.unit_private_ip(), 8080)
     arch = subprocess.check_output(['dpkg', '--print-architecture']).strip()
-    template_data['web_uri'] = "/kubernetes/%s/local/bin/linux/%s/" % (
-        config['version'], arch)
+
+    template_data['web_uri'] = "/kubernetes/%s/local/bin/linux/%s/" % (version,
+                                                                       arch)
+    if version == 'local':
+        template_data['alias'] = hookenv.charm_dir() + '/files/output/'
+    else:
+        directory = '/opt/kubernetes/_output/local/bin/linux/%s/' % arch
+        template_data['alias'] = directory
     _encode(template_data)
     return template_data
 

=== modified file 'hooks/install.py'
--- hooks/install.py	2015-04-10 21:12:25 +0000
+++ hooks/install.py	2015-07-17 20:13:36 +0000
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+
 
 import setup
 setup.pre_install()

=== modified file 'hooks/kubernetes_installer.py'
--- hooks/kubernetes_installer.py	2015-04-10 21:12:25 +0000
+++ hooks/kubernetes_installer.py	2015-07-17 20:13:36 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import os
 import shlex
 import subprocess

=== modified file 'hooks/setup.py'
--- hooks/setup.py	2015-04-10 21:12:25 +0000
+++ hooks/setup.py	2015-07-17 20:13:36 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 def pre_install():
     """
     Do any setup required before the install hook.

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-04-10 21:12:25 +0000
+++ metadata.yaml	2015-07-17 20:13:36 +0000
@@ -3,7 +3,7 @@
 description: |
   Provides a kubernetes api endpoint, scheduler for managing containers.
 maintainers:
-    - Matt Bruzek <[e-mail]>
+    - Matt Bruzek <[e-mail]>
     - Whit Morriss <[e-mail]>
     - Charles Butler <[e-mail]>
 tags:
@@ -17,3 +17,5 @@
 requires:
   etcd:
     interface: etcd
+  network:
+      interface: overlay-network

=== removed directory 'scripts'
=== removed file 'scripts/guestbook.sh'
--- scripts/guestbook.sh	2015-04-10 21:12:25 +0000
+++ scripts/guestbook.sh	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# This script sets up the guestbook example application in Kubernetes.
-# The KUBERENTES_MASTER variable must be set to the URL for kubectl to work.
-# The first argument is optional and can be used for debugging.
-
-set -o errexit  # (set -e)
-
-DEBUG=false
-if [[ "$1" == "-d" ]] || [[ "$1" == "--debug" ]]; then
-  DEBUG=true
-  set -o xtrace  # (set -x)
-fi
-cd /opt/kubernetes/
-# Step One Turn up the redis master
-kubectl create -f examples/guestbook/redis-master.json
-if [[ "${DEBUG}" == true ]]; then
-  kubectl get pods
-fi
-# Step Two: Turn up the master service
-kubectl create -f examples/guestbook/redis-master-service.json
-if [[ "${DEBUG}" == true ]]; then
-  kubectl get services
-fi
-# Step Three: Turn up the replicated slave pods
-kubectl create -f examples/guestbook/redis-slave-controller.json
-if [[ "${DEBUG}" == true ]]; then
-  kubectl get replicationcontrollers
-  kubectl get pods
-fi
-# Step Four: Create the redis slave service
-kubectl create -f examples/guestbook/redis-slave-service.json
-if [[ "${DEBUG}" == true ]]; then
-  kubectl get services
-fi
-# Step Five: Create the frontend pod
-kubectl create -f examples/guestbook/frontend-controller.json
-if [[ "${DEBUG}" == true ]]; then
-  kubectl get replicationcontrollers
-  kubectl get pods
-fi
-
-set +x
-
-echo "# Now run the following commands on your juju client"
-echo "juju run --service kubernetes 'open-port 8000'"
-echo "juju expose kubernetes"
-echo "# Go to the kubernetes public address on port 8000 to see the guestbook application"

=== modified file 'unit_tests/kubernetes_installer_test.py'
--- unit_tests/kubernetes_installer_test.py	2015-04-10 21:12:25 +0000
+++ unit_tests/kubernetes_installer_test.py	2015-07-17 20:13:36 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from mock import patch
 from path import path
 from path import Path

=== modified file 'unit_tests/test_install.py'
--- unit_tests/test_install.py	2015-04-10 21:12:25 +0000
+++ unit_tests/test_install.py	2015-07-17 20:13:36 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from mock import patch, Mock, MagicMock
 from path import Path
 import pytest