Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube

* 'rename-to-kube' of https://github.com/eparis/kubernetes:
  rename kube server binaries to kube-

Conflicts:
	docs/salt.md

contrib/completions/bash/kubecfg

@@ -12,7 +12,7 @@
 #     . kubecfg
 #
 # Note:
-# Currently, the completions will not work if the apiserver daemon is not
+# Currently, the completions will not work if the kube-apiserver daemon is not
 # running on localhost on the standard port 8080
 
 __contains_word () {

contrib/completions/bash/kubectl

@@ -12,7 +12,7 @@
 #     . kubectl
 #
 # Note:
-# Currently, the completions will not work if the apiserver daemon is not
+# Currently, the completions will not work if the kube-apiserver daemon is not
 # running on localhost on the standard port 8080
 
 __contains_word()

contrib/init/systemd/README.md

@@ -6,7 +6,7 @@ other via 127.0.0.1.
 
 They require that etcd be available at 127.0.0.1:4001.
 
-Daemons may have multiple config files.  An example is that the scheduler will pull in 'config', 'apiserver', and 'scheduler'.  In that order.  Each file may overwrite the values of the previous file.  The 'config' file is sourced by all daemons.  The apiserver config file is sourced by those daemons which must know how to reach the apiserver.  Each daemon has its own config file for configuration specific to that daemon.
+Daemons may have multiple config files.  An example is that the scheduler will pull in 'config', 'apiserver', and 'scheduler'.  In that order.  Each file may overwrite the values of the previous file.  The 'config' file is sourced by all daemons.  The kube-apiserver config file is sourced by those daemons which must know how to reach the kube-apiserver.  Each daemon has its own config file for configuration specific to that daemon.
 
 Commenting out all values or removing all environment files will launch the daemons with no command line options.
 
@@ -14,11 +14,9 @@ Assumptions of the service files
 --------------------------------
 
 1. All binaries live in /usr/bin.
-2. All binaries (except kubelet) are prefixed with kube-
-   * Ex. the apiserver binary should be /usr/bin/kube-apiserver
-3. There is a user named 'kube' on the system.
-   * apiserver, controller-manager, and scheduler are run as kube, not root
-4. Configuration is done in via environment files in /etc/kubernetes/
+2. There is a user named 'kube' on the system.
+   * kube-apiserver, kube-controller-manager, and kube-scheduler are run as kube, not root
+3. Configuration is done in via environment files in /etc/kubernetes/
 
 Non kubernetes defaults in the environment files
 ------------------------------------------------
@@ -31,6 +29,6 @@ Notes
 -----
 It may seem reasonable to use --option=${OPTION} in the .service file instead of only putting the command line option in the environment file.  However this results in the possiblity of daemons being called with --option= if the environment file does not define a value.  Whereas including the --option string inside the environment file means that nothing will be passed to the daemon.  So the daemon default will be used for things unset by the environment files.
 
-While some command line options to the daemons use the default when passed an empty option some cause the daemon to fail to launch.  --allow_privileged= (without a value of true/false) will cause the apiserver and kubelet to refuse to launch.
+While some command line options to the daemons use the default when passed an empty option some cause the daemon to fail to launch.  --allow_privileged= (without a value of true/false) will cause the kube-apiserver and kubelet to refuse to launch.
 
 It also may seem reasonable to just use ${DAEMON_ARGS} and string all of these into one line in the environment file.  While that makes the .service file simple it makes the admin job more difficult to locate and make appropriate changes to the config.  This is a tradeoff between having to update the .service file to add new options or having the config files easy for an admin to work with.  I choose: "easy for adminmost of the time".

contrib/init/systemd/environ/apiserver

@@ -1,7 +1,7 @@
 ###
 # kubernetes system config
 #
-# The following values are used to configure the kubernetes-apiserver
+# The following values are used to configure the kube-apiserver
 #
 
 # The address on the local server to listen to.
@@ -10,7 +10,7 @@ KUBE_API_ADDRESS="--address=127.0.0.1"
 # The port on the local server to listen on.
 KUBE_API_PORT="--port=8080"
 
-# How the replication controller and scheduler find the apiserver
+# How the replication controller and scheduler find the kube-apiserver
 KUBE_MASTER="--master=127.0.0.1:8080"
 
 # Port minions listen on

contrib/init/systemd/environ/config

@@ -4,11 +4,11 @@
 # The following values are used to configure various aspects of all
 # kubernetes services, including
 #
-#   kubernetes-apiserver.service
-#   kubernetes-controller-manager.service
-#   kubernetes-scheduler.service
+#   kube-apiserver.service
+#   kube-controller-manager.service
+#   kube-scheduler.service
 #   kubelet.service
-#   kubernetes-proxy.service
+#   kube-proxy.service
 
 # Comma seperated list of nodes in the etcd cluster
 KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001"

contrib/recipes/docs/apiserver_hipache_registration.md

@@ -20,10 +20,10 @@ First, create your kube-apiserver.service file (change necessary variables)
 
     [Service]
     EnvironmentFile=/etc/network-environment
-    ExecStartPre=/usr/bin/rm /opt/bin/apiserver
-    ExecStartPre=/usr/bin/wget -P /opt/bin https://path/to/apiserver/binary
-    ExecStartPre=/usr/bin/chmod +x /opt/bin/apiserver
-    ExecStart=/opt/bin/apiserver \
+    ExecStartPre=/usr/bin/rm /opt/bin/kube-apiserver
+    ExecStartPre=/usr/bin/wget -P /opt/bin https://path/to/kube-apiserver/binary
+    ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
+    ExecStart=/opt/bin/kube-apiserver \
     -address=0.0.0.0 \
     -port=8080 \
     -etcd_servers=http://10.1.10.10:4001
@@ -103,4 +103,4 @@ That's it! Fleet will schedule the apiserver on one of your minions and once it'
 ###Questions
 twitter @jeefy
 
-irc.freenode.net #kubernetes jeefy
+irc.freenode.net #kubernetes jeefy