rename kube server binaries to kube-

apiserver becomes kube-apiserver controller-manager -> kube-controller-manager scheduler and proxy similarly. Only thing I promise is that right now hack/build-go.sh and build/release.sh exit with 0. That's it. Who knows if any of this actually works....
2014-11-10 19:34:21 -05:00
parent ec51ec3e90
commit a99c3c7963
53 changed files with 236 additions and 236 deletions
--- a/docs/getting-started-guides/coreos/configs/master.yml
+++ b/docs/getting-started-guides/coreos/configs/master.yml
@@ -79,43 +79,44 @@ coreos:
      content: |
        [Unit]
        After=network-online.target
-        Before=apiserver.service
-        Before=controller-manager.service
+        Before=kube-apiserver.service
+        Before=kube-controller-manager.service
        Before=kubelet.service
-        Before=proxy.service
+        Before=kube-proxy.service
+        Before=kube-scheduler.service
        Description=Download Kubernetes Binaries
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
        Requires=network-online.target

        [Service]
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/apiserver
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/controller-manager
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-apiserver
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-controller-manager
        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kubecfg
        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kubelet
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/proxy
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/scheduler
-        ExecStart=/usr/bin/chmod +x /opt/bin/apiserver
-        ExecStart=/usr/bin/chmod +x /opt/bin/controller-manager
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-proxy
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-scheduler
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-apiserver
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-controller-manager
        ExecStart=/usr/bin/chmod +x /opt/bin/kubecfg
        ExecStart=/usr/bin/chmod +x /opt/bin/kubelet
-        ExecStart=/usr/bin/chmod +x /opt/bin/proxy
-        ExecStart=/usr/bin/chmod +x /opt/bin/scheduler
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-proxy
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-scheduler
        RemainAfterExit=yes
        Type=oneshot
-    - name: apiserver.service
+    - name: kube-apiserver.service
      command: start
      content: |
        [Unit]
        After=etcd.service
        After=download-kubernetes.service
-        ConditionFileIsExecutable=/opt/bin/apiserver
+        ConditionFileIsExecutable=/opt/bin/kube-apiserver
        Description=Kubernetes API Server
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
        Wants=etcd.service
        Wants=download-kubernetes.service

        [Service]
-        ExecStart=/opt/bin/apiserver \
+        ExecStart=/opt/bin/kube-apiserver \
        --address=127.0.0.1 \
        --port=8080 \
        --etcd_servers=http://127.0.0.1:4001 \
@@ -125,19 +126,19 @@ coreos:

        [Install]
        WantedBy=multi-user.target
-    - name: scheduler.service
+    - name: kube-scheduler.service
      command: start
      content: |
        [Unit]
-        After=apiserver.service
+        After=kube-apiserver.service
        After=download-kubernetes.service
-        ConditionFileIsExecutable=/opt/bin/scheduler
+        ConditionFileIsExecutable=/opt/bin/kube-scheduler
        Description=Kubernetes Scheduler
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-        Wants=apiserver.service
+        Wants=kube-apiserver.service

        [Service]
-        ExecStart=/opt/bin/scheduler \
+        ExecStart=/opt/bin/kube-scheduler \
        --logtostderr=true \
        --master=127.0.0.1:8080
        Restart=always
@@ -145,20 +146,20 @@ coreos:

        [Install]
        WantedBy=multi-user.target
-    - name: controller-manager.service
+    - name: kube-controller-manager.service
      command: start
      content: |
        [Unit]
        After=etcd.service
        After=download-kubernetes.service
-        ConditionFileIsExecutable=/opt/bin/controller-manager
+        ConditionFileIsExecutable=/opt/bin/kube-controller-manager
        Description=Kubernetes Controller Manager
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
        Wants=etcd.service
        Wants=download-kubernetes.service

        [Service]
-        ExecStart=/opt/bin/controller-manager \
+        ExecStart=/opt/bin/kube-controller-manager \
        --master=127.0.0.1:8080 \
        --machines=192.168.12.10,192.168.12.11,192.168.12.12 \
        --logtostderr=true
@@ -191,20 +192,20 @@ coreos:

        [Install]
        WantedBy=multi-user.target
-    - name: proxy.service
+    - name: kube-proxy.service
      command: start
      content: |
        [Unit]
        After=etcd.service
        After=download-kubernetes.service
-        ConditionFileIsExecutable=/opt/bin/proxy
+        ConditionFileIsExecutable=/opt/bin/kube-proxy
        Description=Kubernetes Proxy
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
        Wants=etcd.service
        Wants=download-kubernetes.service

        [Service]
-        ExecStart=/opt/bin/proxy --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
+        ExecStart=/opt/bin/kube-proxy --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
        Restart=always
        RestartSec=10

--- a/docs/getting-started-guides/coreos/configs/standalone.yml
+++ b/docs/getting-started-guides/coreos/configs/standalone.yml
@@ -12,39 +12,40 @@ coreos:
      content: |
        [Unit]
        After=network-online.target
-        Before=apiserver.service
-        Before=controller-manager.service
+        Before=kube-apiserver.service
+        Before=kube-controller-manager.service
        Before=kubelet.service
-        Before=proxy.service
+        Before=kube-proxy.service
+        Before=kube-scheduler.service
        Description=Download Kubernetes Binaries
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
        Requires=network-online.target

        [Service]
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/apiserver
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/controller-manager
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-apiserver
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-controller-manager
        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kubecfg
        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kubelet
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/proxy
-        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/scheduler
-        ExecStart=/usr/bin/chmod +x /opt/bin/apiserver
-        ExecStart=/usr/bin/chmod +x /opt/bin/controller-manager
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-proxy
+        ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-scheduler
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-apiserver
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-controller-manager
        ExecStart=/usr/bin/chmod +x /opt/bin/kubecfg
        ExecStart=/usr/bin/chmod +x /opt/bin/kubelet
-        ExecStart=/usr/bin/chmod +x /opt/bin/proxy
-        ExecStart=/usr/bin/chmod +x /opt/bin/scheduler
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-proxy
+        ExecStart=/usr/bin/chmod +x /opt/bin/kube-scheduler
        RemainAfterExit=yes
        Type=oneshot
-    - name: apiserver.service
+    - name: kube-apiserver.service
      command: start
      content: |
        [Unit]
-        ConditionFileIsExecutable=/opt/bin/apiserver
+        ConditionFileIsExecutable=/opt/bin/kube-apiserver
        Description=Kubernetes API Server
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes

        [Service]
-        ExecStart=/opt/bin/apiserver \
+        ExecStart=/opt/bin/kube-apiserver \
        --address=127.0.0.1 \
        --port=8080 \
        --etcd_servers=http://127.0.0.1:4001 \
@@ -54,19 +55,19 @@ coreos:

        [Install]
        WantedBy=multi-user.target
-    - name: scheduler.service
+    - name: kube-scheduler.service
      command: start
      content: |
        [Unit]
-        After=apiserver.service
+        After=kube-apiserver.service
        After=download-kubernetes.service
-        ConditionFileIsExecutable=/opt/bin/scheduler
+        ConditionFileIsExecutable=/opt/bin/kube-scheduler
        Description=Kubernetes Scheduler
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-        Wants=apiserver.service
+        Wants=kube-apiserver.service

        [Service]
-        ExecStart=/opt/bin/scheduler \
+        ExecStart=/opt/bin/kube-scheduler \
        --logtostderr=true \
        --master=127.0.0.1:8080
        Restart=always
@@ -74,16 +75,16 @@ coreos:

        [Install]
        WantedBy=multi-user.target
-    - name: controller-manager.service
+    - name: kube-controller-manager.service
      command: start
      content: |
        [Unit]
-        ConditionFileIsExecutable=/opt/bin/controller-manager
+        ConditionFileIsExecutable=/opt/bin/kube-controller-manager
        Description=Kubernetes Controller Manager
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes

        [Service]
-        ExecStart=/opt/bin/controller-manager \
+        ExecStart=/opt/bin/kube-controller-manager \
        --master=127.0.0.1:8080 \
        --machines=127.0.0.1 \
        --logtostderr=true
@@ -112,16 +113,16 @@ coreos:

        [Install]
        WantedBy=multi-user.target
-    - name: proxy.service
+    - name: kube-proxy.service
      command: start
      content: |
        [Unit]
-        ConditionFileIsExecutable=/opt/bin/proxy
+        ConditionFileIsExecutable=/opt/bin/kube-proxy
        Description=Kubernetes Proxy
        Documentation=https://github.com/GoogleCloudPlatform/kubernetes

        [Service]
-        ExecStart=/opt/bin/proxy --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
+        ExecStart=/opt/bin/kube-proxy --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
        Restart=on-failure
        RestartSec=1

--- a/docs/getting-started-guides/coreos/coreos_quick_start.md
+++ b/docs/getting-started-guides/coreos/coreos_quick_start.md
@@ -22,11 +22,11 @@ sudo cp kubernetes/docs/getting-started-guides/coreos/units/* /etc/systemd/syste
 ### Start the Kubernetes services

 ```
-sudo systemctl start apiserver
-sudo systemctl start scheduler
-sudo systemctl start controller-manager
+sudo systemctl start kube-apiserver
+sudo systemctl start kube-scheduler
+sudo systemctl start kube-controller-manager
 sudo systemctl start kubelet
-sudo systemctl start proxy
+sudo systemctl start kube-proxy
 ```

 ### Running commands remotely
--- a/docs/getting-started-guides/coreos/units/download-kubernetes.service
+++ b/docs/getting-started-guides/coreos/units/download-kubernetes.service
@@ -1,23 +1,23 @@
 [Unit]
 After=network-online.target
-Before=apiserver.service
-Before=controller-manager.service
+Before=kube-apiserver.service
+Before=kube-controller-manager.service
 Before=kubelet.service
-Before=proxy.service
+Before=kube-proxy.service
 Description=Download Kubernetes Binaries
 Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 Requires=network-online.target

 [Service]
-ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/apiserver
-ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/controller-manager
+ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-apiserver
+ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-controller-manager
 ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kubecfg
 ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kubelet
-ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/proxy
-ExecStart=/usr/bin/chmod +x /opt/bin/apiserver
-ExecStart=/usr/bin/chmod +x /opt/bin/controller-manager
+ExecStart=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-proxy
+ExecStart=/usr/bin/chmod +x /opt/bin/kube-apiserver
+ExecStart=/usr/bin/chmod +x /opt/bin/kube-controller-manager
 ExecStart=/usr/bin/chmod +x /opt/bin/kubecfg
 ExecStart=/usr/bin/chmod +x /opt/bin/kubelet
-ExecStart=/usr/bin/chmod +x /opt/bin/proxy
+ExecStart=/usr/bin/chmod +x /opt/bin/kube-proxy
 RemainAfterExit=yes
 Type=oneshot
--- a/docs/getting-started-guides/coreos/units/kube-apiserver.service
+++ b/docs/getting-started-guides/coreos/units/kube-apiserver.service
@@ -1,10 +1,10 @@
 [Unit]
-ConditionFileIsExecutable=/opt/bin/apiserver
+ConditionFileIsExecutable=/opt/bin/kube-apiserver
 Description=Kubernetes API Server
 Documentation=https://github.com/GoogleCloudPlatform/kubernetes

 [Service]
-ExecStart=/opt/bin/apiserver \
+ExecStart=/opt/bin/kube-apiserver \
 --address=127.0.0.1 \
 --port=8080 \
 --etcd_servers=http://127.0.0.1:4001 \
--- a/docs/getting-started-guides/coreos/units/kube-controller-manager.service
+++ b/docs/getting-started-guides/coreos/units/kube-controller-manager.service
@@ -1,10 +1,10 @@
 [Unit]
-ConditionFileIsExecutable=/opt/bin/controller-manager
+ConditionFileIsExecutable=/opt/bin/kube-controller-manager
 Description=Kubernetes Controller Manager
 Documentation=https://github.com/GoogleCloudPlatform/kubernetes

 [Service]
-ExecStart=/opt/bin/controller-manager \
+ExecStart=/opt/bin/kube-controller-manager \
 --master=127.0.0.1:8080 \
 --machines=127.0.0.1 \
 --etcd_servers=http://127.0.0.1:4001 \
--- a/docs/getting-started-guides/coreos/units/kube-proxy.service
+++ b/docs/getting-started-guides/coreos/units/kube-proxy.service
@@ -1,10 +1,10 @@
 [Unit]
-ConditionFileIsExecutable=/opt/bin/proxy
+ConditionFileIsExecutable=/opt/bin/kube-proxy
 Description=Kubernetes Proxy
 Documentation=https://github.com/GoogleCloudPlatform/kubernetes

 [Service]
-ExecStart=/opt/bin/proxy --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
+ExecStart=/opt/bin/kube-proxy --etcd_servers=http://127.0.0.1:4001 --logtostderr=true
 Restart=on-failure
 RestartSec=1

--- a/docs/getting-started-guides/coreos/units/kube-scheduler.service
+++ b/docs/getting-started-guides/coreos/units/kube-scheduler.service
@@ -1,12 +1,12 @@
 [Unit]
-After=apiserver.service
-ConditionFileIsExecutable=/opt/bin/scheduler
+After=kube-apiserver.service
+ConditionFileIsExecutable=/opt/bin/kube-scheduler
 Description=Kubernetes Scheduler
 Documentation=https://github.com/GoogleCloudPlatform/kubernetes
-Wants=apiserver.service
+Wants=kube-apiserver.service

 [Service]
-ExecStart=/opt/bin/scheduler \
+ExecStart=/opt/bin/kube-scheduler \
 --logtostderr=true \
 --master=127.0.0.1:8080
 Restart=always