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
duda · Nov 17, 2014 · 66d287f · 66d287f
2 parents 5fc485f + a99c3c7
commit 66d287f
Show file tree

Hide file tree

Showing 53 changed files with 235 additions and 235 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -83,10 +83,10 @@ readonly DOCKER_DATA_MOUNT_ARGS=(
 
 readonly KUBE_RUN_IMAGE_BASE="kubernetes"
 readonly KUBE_RUN_IMAGES=(
-  apiserver
-  controller-manager
-  proxy
-  scheduler
+  kube-apiserver
+  kube-controller-manager
+  kube-proxy
+  kube-scheduler
   kubelet
   bootstrap
 )

diff --git a/build/run-images/apiserver/run.sh b/build/run-images/apiserver/run.sh
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./apiserver -address=0.0.0.0 -etcd_servers="${ETCD_SERVERS}"
+./kube-apiserver -address=0.0.0.0 -etcd_servers="${ETCD_SERVERS}"
diff --git a/build/run-images/bootstrap/run.sh b/build/run-images/bootstrap/run.sh
@@ -31,26 +31,26 @@ containers:
         hostPort: 4001
         containerPort: 4001
         protocol: TCP
-  - name: apiserver
+  - name: kube-apiserver
     image: kubernetes
     imagePullPolicy: never
     ports:
-      - name: apiserver-port
+      - name: kube-apiserver-port
         hostPort: 8080
         containerPort: 8080
         protocol: TCP
-    command: ["/kubernetes/apiserver", "-v=5", "-address=0.0.0.0", "-etcd_servers=http://127.0.0.1:4001"]
+    command: ["/kubernetes/kube-apiserver", "-v=5", "-address=0.0.0.0", "-etcd_servers=http://127.0.0.1:4001"]
   - name: controller-manager
     image: kubernetes
     imagePullPolicy: never
-    command: ["/kubernetes/controller-manager", "-v=5", "-master=127.0.0.1:8080", "-machines=${KUBELET_IP}"]
+    command: ["/kubernetes/kube-controller-manager", "-v=5", "-master=127.0.0.1:8080", "-machines=${KUBELET_IP}"]
   - name: proxy
     image: kubernetes
     imagePullPolicy: never
-    command: ["/kubernetes/proxy", "-v=5", "-etcd_servers=http://127.0.0.1:4001"]
+    command: ["/kubernetes/kube-proxy", "-v=5", "-etcd_servers=http://127.0.0.1:4001"]
   - name: scheduler
     image: kubernetes
     imagePullPolicy: never
-    command: ["/kubernetes/scheduler", "-v=5", "-master=127.0.0.1:8080"]
+    command: ["/kubernetes/kube-scheduler", "-v=5", "-master=127.0.0.1:8080"]
 EOF
 ./kubelet -v=5 -address=0.0.0.0 -hostname_override=${KUBELET_IP} -etcd_servers=http://${HOST_IP}:4001 -config pod.yaml
diff --git a/build/run-images/controller-manager/run.sh b/build/run-images/controller-manager/run.sh
@@ -18,4 +18,4 @@
 # configuration and that we have a local minion.
 KUBE_MINIONS="${KUBE_MINIONS:-$(hostname -f)}"
 
-./controller-manager -master="${API_SERVER}" --machines="${KUBE_MINIONS}"
+./kube-controller-manager -master="${API_SERVER}" --machines="${KUBE_MINIONS}"
diff --git a/build/run-images/proxy/run.sh b/build/run-images/proxy/run.sh
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./proxy --etcd_servers="${ETCD_SERVERS}"
+./kube-proxy --etcd_servers="${ETCD_SERVERS}"
diff --git a/build/run-images/scheduler/run.sh b/build/run-images/scheduler/run.sh
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./scheduler -master="${API_SERVER}"
+./kube-scheduler -master="${API_SERVER}"
diff --git a/cluster/rackspace/cloud-config/master-cloud-config.yaml b/cluster/rackspace/cloud-config/master-cloud-config.yaml
@@ -7,8 +7,8 @@ write_files:
       #!/bin/sh
       m=$(echo $(etcdctl ls --recursive /corekube/minions | cut -d/ -f4 | sort) | tr ' ' ,)
       echo "Found $m"
-      mkdir -p /run/apiserver
-      echo "MINIONS=$m" > /run/apiserver/minions.env
+      mkdir -p /run/kube-apiserver
+      echo "MINIONS=$m" > /run/kube-apiserver/minions.env
   - path: /opt/bin/git-kubernetes-nginx.sh
     permissions: 0755
     content: |
@@ -75,21 +75,21 @@ coreos:
         After=download-release.service
         Requires=download-release.service
         [Service]
-        EnvironmentFile=-/run/apiserver/minions.env
-        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/apiserver /opt/bin/apiserver
-        ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --etcd_servers=http://127.0.0.1:4001 --portal_net=PORTAL_NET --logtostderr=true
+        EnvironmentFile=-/run/kube-apiserver/minions.env
+        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-apiserver /opt/bin/kube-apiserver
+        ExecStart=/opt/bin/kube-apiserver --address=127.0.0.1 --port=8080 --etcd_servers=http://127.0.0.1:4001 --portal_net=PORTAL_NET --logtostderr=true
         Restart=always
         RestartSec=2
     - name: master-apiserver-sighup.path
       command: start
       content: |
         [Path]
-        PathChanged=/run/apiserver/minions.env
+        PathChanged=/run/kube-apiserver/minions.env
     - name: master-apiserver-sighup.service
       command: start
       content: |
         [Service]
-        ExecStart=/usr/bin/pkill -SIGHUP -f apiserver
+        ExecStart=/usr/bin/pkill -SIGHUP -f kube-apiserver
     - name: minion-finder.service
       command: start
       content: |
@@ -115,8 +115,8 @@ coreos:
         After=master-apiserver.service
         Requires=master-apiserver.service
         [Service]
-        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/controller-manager /opt/bin/controller-manager
-        ExecStart=/opt/bin/controller-manager --master=127.0.0.1:8080 --machines=${MINIONS} --logtostderr=true
+        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-controller-manager /opt/bin/kube-controller-manager
+        ExecStart=/opt/bin/kube-controller-manager --master=127.0.0.1:8080 --machines=${MINIONS} --logtostderr=true
         Restart=always
         RestartSec=2
     - name: master-scheduler.service
@@ -130,8 +130,8 @@ coreos:
         After=master-apiserver.service
         Requires=master-apiserver.service
         [Service]
-        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/scheduler /opt/bin/scheduler
-        ExecStart=/opt/bin/scheduler --master=127.0.0.1:8080 --logtostderr=true
+        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-scheduler /opt/bin/kube-scheduler
+        ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080 --logtostderr=true
         Restart=always
         RestartSec=10
     #Running nginx service with --net="host" is a necessary evil until running all k8s services in docker.

diff --git a/cluster/rackspace/cloud-config/minion-cloud-config.yaml b/cluster/rackspace/cloud-config/minion-cloud-config.yaml
@@ -119,8 +119,8 @@ coreos:
         After=download-release.service
         Requires=download-release.service
         [Service]
-        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/proxy /opt/bin/proxy
-        ExecStart=/opt/bin/proxy --bind_address=$private_ipv4 --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
+        ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy
+        ExecStart=/opt/bin/kube-proxy --bind_address=$private_ipv4 --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
         Restart=always
         RestartSec=2
     - name: minion-advertiser.service

diff --git a/cluster/saltbase/salt/apiserver/default → cluster/saltbase/salt/kube-apiserver/default b/cluster/saltbase/salt/apiserver/default → cluster/saltbase/salt/kube-apiserver/default
diff --git a/cluster/saltbase/salt/apiserver/init.sls → ...ter/saltbase/salt/kube-apiserver/init.sls b/cluster/saltbase/salt/apiserver/init.sls → ...ter/saltbase/salt/kube-apiserver/init.sls
@@ -1,44 +1,44 @@
 {% if grains['os_family'] == 'RedHat' %}
-{% set environment_file = '/etc/sysconfig/apiserver' %}
+{% set environment_file = '/etc/sysconfig/kube-apiserver' %}
 {% else %}
-{% set environment_file = '/etc/default/apiserver' %}
+{% set environment_file = '/etc/default/kube-apiserver' %}
 {% endif %}
 
 {{ environment_file }}:
   file.managed:
-    - source: salt://apiserver/default
+    - source: salt://kube-apiserver/default
     - template: jinja
     - user: root
     - group: root
     - mode: 644
 
-/usr/local/bin/apiserver:
+/usr/local/bin/kube-apiserver:
   file.managed:
-    - source: salt://kube-bins/apiserver
+    - source: salt://kube-bins/kube-apiserver
     - user: root
     - group: root
     - mode: 755
 
 {% if grains['os_family'] == 'RedHat' %}
 
-/usr/lib/systemd/system/apiserver.service:
+/usr/lib/systemd/system/kube-apiserver.service:
   file.managed:
-    - source: salt://apiserver/apiserver.service
+    - source: salt://kube-apiserver/kube-apiserver.service
     - user: root
     - group: root
 
 {% else %}
 
-/etc/init.d/apiserver:
+/etc/init.d/kube-apiserver:
   file.managed:
-    - source: salt://apiserver/initd
+    - source: salt://kube-apiserver/initd
     - user: root
     - group: root
     - mode: 755
 
 {% endif %}
 
-apiserver:
+kube-apiserver:
   group.present:
     - system: True
   user.present:
@@ -47,14 +47,14 @@ apiserver:
     - groups:
       - kube-cert
     - shell: /sbin/nologin
-    - home: /var/apiserver
+    - home: /var/kube-apiserver
     - require:
-      - group: apiserver
+      - group: kube-apiserver
   service.running:
     - enable: True
     - watch:
       - file: {{ environment_file }}
-      - file: /usr/local/bin/apiserver
+      - file: /usr/local/bin/kube-apiserver
 {% if grains['os_family'] != 'RedHat' %}
-      - file: /etc/init.d/apiserver
+      - file: /etc/init.d/kube-apiserver
 {% endif %}
diff --git a/cluster/saltbase/salt/apiserver/initd → cluster/saltbase/salt/kube-apiserver/initd b/cluster/saltbase/salt/apiserver/initd → cluster/saltbase/salt/kube-apiserver/initd
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 ### BEGIN INIT INFO
-# Provides:   apiserver
+# Provides:   kube-apiserver
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:
 # Default-Start:     2 3 4 5
@@ -15,12 +15,12 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="The Kubernetes API server"
-NAME=apiserver
-DAEMON=/usr/local/bin/apiserver
+NAME=kube-apiserver
+DAEMON=/usr/local/bin/kube-apiserver
 DAEMON_LOG_FILE=/var/log/$NAME.log
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-DAEMON_USER=apiserver
+DAEMON_USER=kube-apiserver
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0

diff --git a/...saltbase/salt/apiserver/apiserver.service → ...alt/kube-apiserver/kube-apiserver.service b/...saltbase/salt/apiserver/apiserver.service → ...alt/kube-apiserver/kube-apiserver.service
@@ -3,8 +3,8 @@ Description=Kubernetes API Server
 Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 
 [Service]
-EnvironmentFile=/etc/sysconfig/apiserver
-ExecStart=/usr/local/bin/apiserver "$DAEMON_ARGS"
+EnvironmentFile=/etc/sysconfig/kube-apiserver
+ExecStart=/usr/local/bin/kube-apiserver "$DAEMON_ARGS"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/.../saltbase/salt/controller-manager/default → ...base/salt/kube-controller-manager/default b/.../saltbase/salt/controller-manager/default → ...base/salt/kube-controller-manager/default
diff --git a/...saltbase/salt/controller-manager/init.sls → ...ase/salt/kube-controller-manager/init.sls b/...saltbase/salt/controller-manager/init.sls → ...ase/salt/kube-controller-manager/init.sls
@@ -1,60 +1,60 @@
 {% if grains['os_family'] == 'RedHat' %}
-{% set environment_file = '/etc/sysconfig/controller-manager' %}
+{% set environment_file = '/etc/sysconfig/kube-controller-manager' %}
 {% else %}
-{% set environment_file = '/etc/default/controller-manager' %}
+{% set environment_file = '/etc/default/kube-controller-manager' %}
 {% endif %}
 
 {{ environment_file }}:
   file.managed:
-    - source: salt://controller-manager/default
+    - source: salt://kube-controller-manager/default
     - template: jinja
     - user: root
     - group: root
     - mode: 644
 
-/usr/local/bin/controller-manager:
+/usr/local/bin/kube-controller-manager:
   file.managed:
-    - source: salt://kube-bins/controller-manager
+    - source: salt://kube-bins/kube-controller-manager
     - user: root
     - group: root
     - mode: 755
 
 {% if grains['os_family'] == 'RedHat' %}
 
-/usr/lib/systemd/system/controller-manager.service:
+/usr/lib/systemd/system/kube-controller-manager.service:
   file.managed:
-    - source: salt://controller-manager/controller-manager.service
+    - source: salt://kube-controller-manager/kube-controller-manager.service
     - user: root
     - group: root
 
 {% else %}
 
-/etc/init.d/controller-manager:
+/etc/init.d/kube-controller-manager:
   file.managed:
-    - source: salt://controller-manager/initd
+    - source: salt://kube-controller-manager/initd
     - user: root
     - group: root
     - mode: 755
 
 {% endif %}
 
-controller-manager:
+kube-controller-manager:
   group.present:
     - system: True
   user.present:
     - system: True
     - gid_from_name: True
     - shell: /sbin/nologin
-    - home: /var/controller-manager
+    - home: /var/kube-controller-manager
     - require:
-      - group: controller-manager
+      - group: kube-controller-manager
   service.running:
     - enable: True
     - watch:
-      - file: /usr/local/bin/controller-manager
+      - file: /usr/local/bin/kube-controller-manager
       - file: {{ environment_file }}
 {% if grains['os_family'] != 'RedHat' %}
-      - file: /etc/init.d/controller-manager
+      - file: /etc/init.d/kube-controller-manager
 {% endif %}
 
 
diff --git a/...er/saltbase/salt/controller-manager/initd → ...ltbase/salt/kube-controller-manager/initd b/...er/saltbase/salt/controller-manager/initd → ...ltbase/salt/kube-controller-manager/initd
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 ### BEGIN INIT INFO
-# Provides:    controller-manager
+# Provides:    kube-controller-manager
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:
 # Default-Start:     2 3 4 5
@@ -16,13 +16,13 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="The Kubernetes container manager"
-NAME=controller-manager
-DAEMON=/usr/local/bin/controller-manager
+NAME=kube-controller-manager
+DAEMON=/usr/local/bin/kube-controller-manager
 DAEMON_ARGS=""
 DAEMON_LOG_FILE=/var/log/$NAME.log
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-DAEMON_USER=controller-manager
+DAEMON_USER=kube-controller-manager
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0

diff --git a/...roller-manager/controller-manager.service → ...r-manager/kube-controller-manager.service b/...roller-manager/controller-manager.service → ...r-manager/kube-controller-manager.service
@@ -5,7 +5,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/controller-manager
-ExecStart=/usr/local/bin/controller-manager "$DAEMON_ARGS"
+ExecStart=/usr/local/bin/kube-controller-manager "$DAEMON_ARGS"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls
@@ -6,7 +6,7 @@
 
 /usr/local/bin/kube-proxy:
   file.managed:
-    - source: salt://kube-bins/proxy
+    - source: salt://kube-bins/kube-proxy
     - user: root
     - group: root
     - mode: 755

diff --git a/cluster/saltbase/salt/scheduler/default → cluster/saltbase/salt/kube-scheduler/default b/cluster/saltbase/salt/scheduler/default → cluster/saltbase/salt/kube-scheduler/default