Merge pull request #12362 from mbruzek/post-v1-fixes

cluster/juju/charms/trusty/kubernetes-master/hooks/install.py

@@ -64,7 +64,10 @@ def clone_repository():
     """
 
     repository = 'https://github.com/GoogleCloudPlatform/kubernetes.git'
-    kubernetes_directory = '/opt/kubernetes'
+    kubernetes_directory = path('/opt/kubernetes')
+    # Since we can not clone twice, check for the directory and remove it.
+    if kubernetes_directory.isdir():
+        kubernetes_directory.rmtree_p()
 
     command = ['git', 'clone', repository, kubernetes_directory]
     print(command)
@@ -75,8 +78,8 @@ def clone_repository():
 
 def install_packages():
     """
-     Install required packages to build the k8s source, and syndicate between
-     minion nodes. In addition, fetch pip to handle python dependencies
+    Install required packages to build the k8s source, and syndicate between
+    minion nodes. In addition, fetch pip to handle python dependencies
     """
     hookenv.log('Installing Debian packages')
     # Create the list of packages to install.
@@ -87,8 +90,8 @@ def install_packages():
 
 def update_rc_files(strings):
     """
-     Preseed the bash environment for ubuntu and root with K8's env vars to
-     make interfacing with the api easier. (see: kubectrl docs)
+    Preseed the bash environment for ubuntu and root with K8's env vars to
+    make interfacing with the api easier. (see: kubectrl docs)
     """
     rc_files = [path('/home/ubuntu/.bashrc'), path('/root/.bashrc')]
     for rc_file in rc_files:

cluster/juju/charms/trusty/kubernetes/hooks/hooks.py

@@ -204,8 +204,9 @@ def register_machine(apiserver, retry=False):
         mem = info.strip().split(':')[1].strip().split()[0]
     cpus = os.sysconf('SC_NPROCESSORS_ONLN')
 
+    # https://github.com/GoogleCloudPlatform/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

cluster/juju/charms/trusty/kubernetes/hooks/lib/registrator.py

@@ -24,7 +24,7 @@ class Registrator:
     def __init__(self):
         self.ds ={
           "creationTimestamp": "",
-          "kind": "Minion",
+          "kind": "Node",
           "name": "", # private_address
           "metadata": {
             "name": "", #private_address,