Merge lp:~mbruzek/charms/trusty/kubernetes/trunk into lp:~kubernetes/charms/trusty/kubernetes/trunk

[Matt Bruzek]

Synched this charm with the content on github. Then ran the lint and CI tests against the code.

Had to clean up quite a few failures to get here, but this charm passes all tests in CI and is synchronized with the content in github.

http://reports.vapour.ws/charm-test-details/charm-bundle-test-parent-1122

[lp:~mbruzek/charms/trusty/kubernetes/trunk]

15. By Matt Bruzek on 2015-10-09

Changing the flake8 rules to not conflict with the verify-boilerplate k8s tool.

[Charles Butler (lazypower)]

+1 lGTM

Thanks for the hard work Matt. One minor nitpick left inline, but not a blocker.

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-09-24 20:09:00 +0000
+++ Makefile	2015-10-09 16:18:47 +0000
@@ -6,7 +6,7 @@
 	.venv/bin/pip install -q -r requirements.txt
 
 lint: virtualenv
-	@.venv/bin/flake8 hooks --exclude=charmhelpers
+	@.venv/bin/flake8 hooks --exclude=charmhelpers --ignore=W391
 	@.venv/bin/charm proof
 
 test: virtualenv 
@@ -27,3 +27,4 @@
 clean:
 	rm -rf .venv
 	find -name *.pyc -delete
+	rm -rf unit_tests/.cache
 
=== modified file 'README.md'
--- README.md	2015-04-10 21:47:06 +0000
+++ README.md	2015-10-09 16:18:47 +0000
@@ -1,6 +1,6 @@
-# Kubernetes Minion Charm
+# Kubernetes Node Charm
 
-[Kubernetes](https://github.com/googlecloudplatform/kubernetes) is an open
+[Kubernetes](https://github.com/kubernetes/kubernetes) is an open
 source  system for managing containerized applications across multiple hosts.
 Kubernetes uses [Docker](http://www.docker.io/) to package, instantiate and run
 containerized applications.
@@ -28,8 +28,9 @@
 main management contact point providing many management services for the worker
 nodes.
 
-### Kubernetes minion
-The servers that perform the work are known as minions.  Minions must be able to
+### Kubernetes node
+The servers that perform the work are known as nodes (previously minions).  
+Nodes must be able to
 communicate with the master and run the workloads that are assigned to them.
 
 
@@ -55,22 +56,39 @@
 
 #### Deploying the recommended configuration
 
-A bundle can be used to deploy Kubernetes onto any cloud it can be
-orchestrated directly in the Juju Graphical User Interface, when using
-`juju quickstart`:
-
-    juju quickstart https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.yaml
-
-
-For more information on the recommended bundle deployment, see the
-[Kubernetes bundle documentation](https://github.com/whitmo/bundle-kubernetes)
+Use the 'juju quickstart' command to deploy a Kubernetes cluster to any cloud
+supported by Juju.  
+
+The charm store version of the Kubernetes bundle can be deployed as follows:
+
+    juju quickstart u/kubernetes/kubernetes-cluster
+
+> Note: The charm store bundle may be locked to a specific Kubernetes release.
+
+Alternately you could deploy a Kubernetes bundle straight from github or a file:
+
+    juju quickstart https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/juju/bundles/local.yaml
+
+The command above does few things for you:
+
+- Starts a curses based gui for managing your cloud or MAAS credentials
+- Looks for a bootstrapped deployment environment, and bootstraps if
+  required. This will launch a bootstrap node in your chosen
+  deployment environment (machine 0).
+- Deploys the Juju GUI to your environment onto the bootstrap node.
+- Provisions 4 machines, and deploys the Kubernetes services on top of
+  them (Kubernetes-master, two Kubernetes nodes using flannel, and etcd).
+- Orchestrates the relations among the services, and exits.
+
+Now you should have a running Kubernetes. Run `juju status
+--format=oneline` to see the address of your kubernetes-master unit.
 
 
 #### Post Deployment
 
 To interact with the kubernetes environment, either build or
-[download](https://github.com/GoogleCloudPlatform/kubernetes/releases) the
-[kubectl](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubectl.md)
+[download](https://github.com/kubernetes/kubernetes/releases) the
+[kubectl](https://github.com/kubernetes/kubernetes/blob/master/docs/user-guide/kubectl/kubectl.md)
 binary (available in the releases binary tarball) and point it to the master with :
 
 
@@ -79,7 +97,8 @@
     $ export KUBERNETES_MASTER="104.131.108.99"
 
 # Configuration
-For you convenience this charm supports changing the version of kubernetes binaries.
+For you convenience this charm supports changing the version of the Kubernetes
+release through a configuration option.
 This can be done through the Juju GUI or on the command line:
 
     juju set kubernetes version=”v0.10.0”
@@ -89,12 +108,15 @@
 command.
 
 Congratulations you know have deployed a Kubernetes environment! Use the
-[kubectl](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubectl.md)
+[kubectl](https://github.com/kubernetes/kubernetes/blob/master/docs/user-guide/kubectl/kubectl.md)
 to interact with the environment.
 
 # Kubernetes information
 
-- [Kubernetes github project](https://github.com/GoogleCloudPlatform/kubernetes)
-- [Kubernetes issue tracker](https://github.com/GoogleCloudPlatform/kubernetes/issues)
-- [Kubernetes Documenation](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs)
-- [Kubernetes releases](https://github.com/GoogleCloudPlatform/kubernetes/releases)
+- [Kubernetes github project](https://github.com/kubernetes/kubernetes)
+- [Kubernetes issue tracker](https://github.com/kubernetes/kubernetes/issues)
+- [Kubernetes Documenation](https://github.com/kubernetes/kubernetes/tree/master/docs)
+- [Kubernetes releases](https://github.com/kubernetes/kubernetes/releases)
+
+
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/juju/charms/trusty/kubernetes/README.md?pixel)]()
 
=== modified file 'copyright'
--- copyright	2015-07-17 20:00:22 +0000
+++ copyright	2015-10-09 16:18:47 +0000
@@ -1,4 +1,4 @@
-Copyright 2015 Canonical Ltd. 
+Copyright 2015 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.
 
=== modified file 'files/kubelet.upstart.tmpl'
--- files/kubelet.upstart.tmpl	2015-07-17 20:00:22 +0000
+++ files/kubelet.upstart.tmpl	2015-10-09 16:18:47 +0000
@@ -9,7 +9,7 @@
 
 exec /usr/local/bin/kubelet \
      --address=%(kubelet_bind_addr)s \
-     --api_servers=%(kubeapi_server)s \
-     --hostname_override=%(kubelet_bind_addr)s \
-     --cadvisor_port=4193 \
+     --api-servers=%(kubeapi_server)s \
+     --hostname-override=%(kubelet_bind_addr)s \
+     --cadvisor-port=4193 \
      --logtostderr=true
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-10-01 00:35:41 +0000
+++ hooks/hooks.py	2015-10-09 16:18:47 +0000
@@ -1,5 +1,19 @@
 #!/usr/bin/env python
 
+# Copyright 2015 The Kubernetes Authors 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.
+
 """
 The main hook file that is called by Juju.
 """
@@ -11,7 +25,7 @@
 
 from charmhelpers.core import hookenv, host
 from kubernetes_installer import KubernetesInstaller
-from path import path
+from path import Path
 
 from lib.registrator import Registrator
 
@@ -26,10 +40,10 @@
     from the kubernetes-master charm and installs it locally on this machine.
     """
     hookenv.log('Starting api-relation-changed')
-    charm_dir = path(hookenv.charm_dir())
+    charm_dir = Path(hookenv.charm_dir())
     # Get the package architecture, rather than the from the kernel (uname -m).
     arch = subprocess.check_output(['dpkg', '--print-architecture']).strip()
-    kubernetes_bin_dir = path('/opt/kubernetes/bin')
+    kubernetes_bin_dir = Path('/opt/kubernetes/bin')
     # Get the version of kubernetes to install.
     version = subprocess.check_output(['relation-get', 'version']).strip()
     print('Relation version: ', version)
@@ -187,8 +201,9 @@
         mem = info.strip().split(':')[1].strip().split()[0]
     cpus = os.sysconf('SC_NPROCESSORS_ONLN')
 
+    # https://github.com/kubernetes/kubernetes/blob/master/docs/admin/node.md
     registration_request = Registrator()
-    registration_request.data['Kind'] = 'Minion'
+    registration_request.data['kind'] = 'Node'
     registration_request.data['id'] = private_address
     registration_request.data['name'] = private_address
     registration_request.data['metadata']['name'] = private_address
 
=== modified file 'hooks/install'
--- hooks/install	2015-04-10 20:43:29 +0000
+++ hooks/install	2015-10-09 16:18:47 +0000
@@ -13,20 +13,21 @@
     python-pip \
     wget
 
-pip install path.py
+pip install -r $CHARM_DIR/python_requirements.txt
 
 # Create the necessary kubernetes group.
-groupadd kubernetes
-useradd -d /var/lib/kubernetes \
-    -g kubernetes \
-    -s /sbin/nologin \
-    --system \
-    kubernetes
+groupadd --force kubernetes
+
+if grep -q "^kubernetes:" /etc/passwd; then
+    echo "The kubernetes user already exists!"
+else
+    # Create the user when kubernetes does not exist.
+    useradd -d /var/lib/kubernetes \
+        -g kubernetes \
+        -s /sbin/nologin \
+        --system \
+        kubernetes
+fi
 
 install -d -m 0744 -o kubernetes -g kubernetes /var/lib/kubernetes
 install -d -m 0744 -o kubernetes -g kubernetes /etc/kubernetes/manifests
-
-# wait for the world, depends on where we installed it from distro
-#sudo service docker.io stop
-# or upstream archive
-#sudo service docker stop
 
=== modified file 'hooks/kubernetes_installer.py'
--- hooks/kubernetes_installer.py	2015-07-17 20:00:22 +0000
+++ hooks/kubernetes_installer.py	2015-10-09 16:18:47 +0000
@@ -1,7 +1,21 @@
 #!/usr/bin/env python
 
+# Copyright 2015 The Kubernetes Authors 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.
+
 import subprocess
-from path import path
+from path import Path
 
 
 class KubernetesInstaller():
@@ -35,7 +49,7 @@
             print(output)
             destination.chmod(0o755)
 
-    def install(self, install_dir=path('/usr/local/bin')):
+    def install(self, install_dir=Path('/usr/local/bin')):
         """ Create links to the binary files to the install directory. """
 
         if not install_dir.isdir():
 
=== modified file 'hooks/lib/__init__.py'
--- hooks/lib/__init__.py	2015-09-24 20:09:00 +0000
+++ hooks/lib/__init__.py	2015-10-09 16:18:47 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+# Copyright 2015 The Kubernetes Authors 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.
+
 
=== modified file 'hooks/lib/registrator.py'
--- hooks/lib/registrator.py	2015-10-01 00:35:41 +0000
+++ hooks/lib/registrator.py	2015-10-09 16:18:47 +0000
@@ -1,5 +1,19 @@
 #!/usr/bin/env python
 
+# Copyright 2015 The Kubernetes Authors 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.
+
 import httplib
 import json
 import time
@@ -10,7 +24,7 @@
     def __init__(self):
         self.ds = {
             "creationTimestamp": "",
-            "kind": "Minion",
+            "kind": "Node",
             "name": "",  # private_address
             "metadata": {
                 "name": "",  # private_address,
@@ -69,9 +83,9 @@
             return True
         elif response.status in (500,) and result.get(
             'message', '').startswith('The requested resource does not exist'):  # noqa
-            # There's something fishy in the kube api here (0.4 dev), on first
-            # registration of a new minion, we always seem to get this error.
-            # https://github.com/GoogleCloudPlatform/kubernetes/issues/1995
+            # There is something fishy in the kube api here (0.4 dev), first
+            # time to register a new node, we always seem to get this error.
+            # http://issue.k8s.io/1995
             time.sleep(1)
             print("Retrying registration...")
             raise ValueError("Registration returned 500, retry")
 
=== modified file 'hooks/start'
--- hooks/start	2015-01-27 17:31:57 +0000
+++ hooks/start	2015-10-09 16:18:47 +0000
@@ -3,7 +3,7 @@
 set -ex
 
 # Start is guaranteed to be called once when after the unit is installed
-# *AND* once everytime a machine is rebooted.
+# *AND* once every time a machine is rebooted.
 
 if [ ! -f $CHARM_DIR/.unit-state ]
 then
 
=== added file 'python_requirements.txt'
--- python_requirements.txt	1970-01-01 00:00:00 +0000
+++ python_requirements.txt	2015-10-09 16:18:47 +0000
@@ -0,0 +1,1 @@
+path.py
 
=== modified file 'unit_tests/lib/test_registrator.py'
--- unit_tests/lib/test_registrator.py	2015-10-01 03:09:07 +0000
+++ unit_tests/lib/test_registrator.py	2015-10-09 16:18:47 +0000
@@ -1,4 +1,19 @@
 #!/usr/bin/env python
+
+# Copyright 2015 The Kubernetes Authors 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.
+
 import json
 from mock import MagicMock, patch
 from path import Path
 
=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2015-07-17 20:00:22 +0000
+++ unit_tests/test_hooks.py	2015-10-09 16:18:47 +0000
@@ -1,5 +1,19 @@
 #!/usr/bin/env python
 
+# Copyright 2015 The Kubernetes Authors 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.
+
 # import pytest