Updated all the references of GoogleCloudPlatform/kubernetes repo name to the new kubernetes/kubernetes

cluster/juju/bundles/README.md

@@ -12,7 +12,7 @@ containerized applications.
 
 ## Juju TL;DR
 
-The [Juju](https://juju.ubuntu.com) system provides provisioning and
+The [Juju](https://jujucharms.com) system provides provisioning and
 orchestration across a variety of clouds and bare metal. A juju bundle
 describes collection of services and how they interrelate. `juju
 quickstart` allows you to bootstrap a deployment environment and
@@ -23,15 +23,23 @@ deploy a bundle.
 #### Install Juju Quickstart
 
 You will need to
-[install the Juju client](https://juju.ubuntu.com/install/) and
+[install the Juju client](https://jujucharms.com/get-started) and
 `juju-quickstart` as pre-requisites.  To deploy the bundle use
 `juju-quickstart` which runs on Mac OS (`brew install
 juju-quickstart`) or Ubuntu (`apt-get install juju-quickstart`).
 
-### Deploy Kubernetes Bundle
+### Deploy a Kubernetes Bundle
 
-Deploy Kubernetes onto any cloud and orchestrated directly in the Juju
+Use the 'juju quickstart' command to deploy a Kubernetes cluster to any cloud
-Graphical User Interface using `juju quickstart`:
+supported by Juju.  
+
+The charm store version of the Kubernetes bundle can be deployed as folllows:
+
+    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 -i https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.yaml
 
@@ -47,34 +55,37 @@ The command above does few things for you:
 - 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.
+--format=oneline` to see the address of your kubernetes-master unit.
 
 For further reading on [Juju Quickstart](https://pypi.python.org/pypi/juju-quickstart)
 
+Go to the [Getting started with Juju guide](https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/juju.md)
+for more information about deploying a development Kubernetes cluster.
+
 ### Using the Kubernetes Client
 
 You'll need the Kubernetes command line client,
-[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 created cluster.  The kubectl command is
 installed on the kubernetes-master charm. If you want to work with
 the cluster from your computer you will need to install the binary
-locally (see instructions below).
+locally.
 
 You can access kubectl by a number ways using juju.
 
 via juju run:
 
-    juju run --service kubernetes-master/0 "sudo kubectl get mi"
+    juju run --service kubernetes-master/0 "sudo kubectl get nodes"
 
 via juju ssh:
 
-    juju ssh kubernetes-master/0 -t "sudo kubectl get mi"
+    juju ssh kubernetes-master/0 -t "sudo kubectl get nodes"
 
-You may also `juju ssh kubernetes-master/0` and call kubectl from that
+You may also SSH to the kuberentes-master unit (`juju ssh kubernetes-master/0`)
-machine.
+and call kubectl from the command prompt.
 
 See the
-[kubectl documentation](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubectl.md)
+[kubectl documentation](https://github.com/kubernetes/kubernetes/blob/master/docs/user-guide/kubectl/kubectl.md)
 for more details of what can be done with the command line tool.
 
 ### Scaling up the cluster
@@ -128,16 +139,16 @@ key-value store with an http interface.
 
 Juju has complete documentation with regard to setup, and cloud
 configuration on it's own
-[documentation site](https://juju.ubuntu.com/docs/).
+[documentation site](https://jujucharms.com/docs/).
 
-- [Getting Started](https://juju.ubuntu.com/docs/getting-started.html)
+- [Getting Started](https://jujucharms.com/docs/stable/getting-started)
-- [Using Juju](https://juju.ubuntu.com/docs/charms.html)
+- [Using Juju](https://jujucharms.com/docs/stable/charms)
 
 
-## Installing the kubectl outside of kubernetes master machine
+## Installing the kubectl outside of kubernetes-master unit
 
 Download the Kubernetes release from:
-https://github.com/GoogleCloudPlatform/kubernetes/releases and extract
+https://github.com/kubernetes/kubernetes/releases and extract
 the release, you can then just directly use the cli binary at
 ./kubernetes/platforms/linux/amd64/kubectl
 
@@ -148,14 +159,14 @@ You'll need the address of the kubernetes-master as environment variable :
 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
+    export KUBERNETES_MASTER=$(juju status --format=oneline kubernetes-master | grep kubernetes-master | cut -d' ' -f3):8080
 
 And now you can run kubectl on the command line :
 
-    kubectl get mi
+    kubectl get no
 
 See the
-[kubectl documentation](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubectl.md)
+[kubectl documentation](https://github.com/kubernetes/kubernetes/blob/master/docs/user-guide/kubectl/kubectl.md)
 for more details of what can be done with the command line tool.
 
 
@@ -163,16 +174,12 @@ for more details of what can be done with the command line tool.
 
 The kubernetes-bundle is open source and available on github.com.  If
 you want to get started developing on the bundle you can clone it from
-github.  Often you will need the related charms which are also on
+github.  
-github.
 
-    mkdir ~/bundles
+    git clone https://github.com/kubernetes/kubernetes.git
-    git clone https://github.com/whitmo/kubernetes-bundle.git ~/bundles/kubernetes-bundle
-    mkdir -p ~/charms/trusty
-    git clone https://github.com/whitmo/kubernetes-charm.git ~/charms/trusty/kubernetes
-    git clone https://github.com/whitmo/kubernetes-master-charm.git ~/charms/trusty/kubernetes-master
 
-    juju quickstart specs/develop.yaml
+Go to the [Getting started with Juju guide](https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/juju.md)
+for more information about the bundle or charms.
 
 ## How to contribute
 
@@ -181,19 +188,20 @@ Send us pull requests!  We'll send you a cookie if they include tests and docs.
 
 ## Current and Most Complete Information
 
- - [kubernetes-master charm on Github](https://github.com/whitmo/charm-kubernetes-master)
+The charms and bundles are in the [kubernetes](https://github.com/kubernetes/kubernetes)
- - [kubernetes charm on GitHub](https://github.com/whitmo/charm-kubernetes)
+repository in github.
- - [etcd charm on GitHub](https://github.com/whitmo/etcd-charm)
+
- - [Flannel charm on GitHub](https://github.com/chuckbutler/docker-flannel-charm)
+ - [kubernetes-master charm on Github](https://github.com/kubernetes/kubernetes/tree/master/cluster/juju/charms/trusty/kubernetes-master)
- - [Docker charm on GitHub](https://github.com/chuckbutler/docker-charm)
+ - [kubernetes charm on GitHub](https://github.com/kubernetes/kubernetes/tree/master/cluster/juju/charms/trusty/kubernetes)
+
 
 More information about the
-[Kubernetes project](https://github.com/GoogleCloudPlatform/kubernetes)
+[Kubernetes project](https://github.com/kubernetes/kubernetes)
 or check out the
-[Kubernetes Documentation](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs)
+[Kubernetes Documentation](https://github.com/kubernetes/kubernetes/tree/master/docs)
 for more details about the Kubernetes concepts and terminology.
 
-Having a problem? Check the [Kubernetes issues database](https://github.com/GoogleCloudPlatform/kubernetes/issues)
+Having a problem? Check the [Kubernetes issues database](https://github.com/kubernetes/kubernetes/issues)
 for related issues.
 
 

cluster/juju/charms/trusty/kubernetes-master/README.md

@@ -1,6 +1,6 @@
 # Kubernetes Master 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.
@@ -56,22 +56,44 @@ To deploy a Kubernetes environment in Juju :
 
 #### Deploying the recommended configuration
 
-A bundle can be used to deploy Kubernetes onto any cloud it can be
+Use the 'juju quickstart' command to deploy a Kubernetes cluster to any cloud
-orchestrated directly in the Juju Graphical User Interface, when using
+supported by Juju.  
-`juju quickstart`:
 
-    juju quickstart https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.yaml
+The charm store version of the Kubernetes bundle can be deployed as follows:
 
+    juju quickstart u/kubernetes/kubernetes-cluster
 
-For more information on the recommended bundle deployment, see the
+> Note: The charm store bundle may be locked to a specific Kubernetes release.
-[Kubernetes bundle documentation](https://github.com/whitmo/bundle-kubernetes)
+
+Alternately you could deploy a Kubernetes bundle straight from github or a file:
+
+    juju quickstart -i https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.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 minions 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.
+
+For further reading on [Juju Quickstart](https://pypi.python.org/pypi/juju-quickstart)
+
+Go to the [Getting started with Juju guide](https://github.com/kubernetes/kubernetes/blob/master/docs/getting-started-guides/juju.md)
+for more information about deploying a development Kubernetes cluster.
 
 
 #### Post Deployment
 
 To interact with the kubernetes environment, either build or
-[download](https://github.com/GoogleCloudPlatform/kubernetes/releases) the
+[download](https://github.com/kubernetes/kubernetes/releases) 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)
 binary (available in the releases binary tarball) and point it to the master with :
 
 
@@ -90,15 +112,15 @@ and version it will attempt to download the kubernetes binaries using the gsutil
 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 github project](https://github.com/kubernetes/kubernetes)
-- [Kubernetes issue tracker](https://github.com/GoogleCloudPlatform/kubernetes/issues)
+- [Kubernetes issue tracker](https://github.com/kubernetes/kubernetes/issues)
-- [Kubernetes Documenation](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs)
+- [Kubernetes Documenation](https://github.com/kubernetes/kubernetes/tree/master/docs)
-- [Kubernetes releases](https://github.com/GoogleCloudPlatform/kubernetes/releases)
+- [Kubernetes releases](https://github.com/kubernetes/kubernetes/releases)
 
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/juju/charms/trusty/kubernetes-master/README.md?pixel)]()

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

@@ -63,7 +63,7 @@ def clone_repository():
     of kubernetes. Subsequently used during upgrades.
     """
 
-    repository = 'https://github.com/GoogleCloudPlatform/kubernetes.git'
+    repository = 'https://github.com/kubernetes/kubernetes.git'
     kubernetes_directory = path('/opt/kubernetes')
     # Since we can not clone twice, check for the directory and remove it.
     if kubernetes_directory.isdir():

cluster/juju/charms/trusty/kubernetes-master/unit_tests/test_install.py

@@ -80,7 +80,7 @@ class TestInstallHook():
          call is consistent. If we change this, we want to know we've broken it.
         """
         install.clone_repository()
-        repo = 'https://github.com/GoogleCloudPlatform/kubernetes.git'
+        repo = 'https://github.com/kubernetes/kubernetes.git'
         direct = '/opt/kubernetes'
         spmock.check_output.assert_called_with(['git', 'clone', repo, direct])
 

cluster/juju/charms/trusty/kubernetes/README.md

@@ -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 @@ The controlling unit in a Kubernetes cluster is called the master.  It is the
 main management contact point providing many management services for the worker
 nodes.
 
-### Kubernetes minion
+### Kubernetes node
-The servers that perform the work are known as minions.  Minions must be able to
+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 @@ To deploy a Kubernetes environment in Juju :
 
 #### Deploying the recommended configuration
 
-A bundle can be used to deploy Kubernetes onto any cloud it can be
+Use the 'juju quickstart' command to deploy a Kubernetes cluster to any cloud
-orchestrated directly in the Juju Graphical User Interface, when using
+supported by Juju.  
-`juju quickstart`:
 
-    juju quickstart https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.yaml
+The charm store version of the Kubernetes bundle can be deployed as follows:
 
+    juju quickstart u/kubernetes/kubernetes-cluster
 
-For more information on the recommended bundle deployment, see the
+> Note: The charm store bundle may be locked to a specific Kubernetes release.
-[Kubernetes bundle documentation](https://github.com/whitmo/bundle-kubernetes)
+
+Alternately you could deploy a Kubernetes bundle straight from github or a file:
+
+    juju quickstart -i https://raw.githubusercontent.com/whitmo/bundle-kubernetes/master/bundles.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 minions 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
+[download](https://github.com/kubernetes/kubernetes/releases) 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)
 binary (available in the releases binary tarball) and point it to the master with :
 
 
@@ -79,7 +97,8 @@ binary (available in the releases binary tarball) and point it to the master wit
     $ 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,15 +108,15 @@ and version it will attempt to download the kubernetes binaries using the gsutil
 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 github project](https://github.com/kubernetes/kubernetes)
-- [Kubernetes issue tracker](https://github.com/GoogleCloudPlatform/kubernetes/issues)
+- [Kubernetes issue tracker](https://github.com/kubernetes/kubernetes/issues)
-- [Kubernetes Documenation](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/docs)
+- [Kubernetes Documenation](https://github.com/kubernetes/kubernetes/tree/master/docs)
-- [Kubernetes releases](https://github.com/GoogleCloudPlatform/kubernetes/releases)
+- [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)]()

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

@@ -204,7 +204,7 @@ 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
+    # https://github.com/kubernetes/kubernetes/blob/master/docs/admin/node.md
     registration_request = Registrator()
     registration_request.data['kind'] = 'Node'
     registration_request.data['id'] = private_address