Merge pull request #419 from lblackstone/alphabetize

hack: Alphabetize kubelet options in hack scripts

Author: Patrick Baxter

hack/multi-node/user-data.sample

@@ -20,22 +20,21 @@ coreos:
         ExecStartPre=/bin/mkdir -p /var/lib/cni
         ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
         ExecStart=/usr/lib/coreos/kubelet-wrapper \
-          --kubeconfig=/etc/kubernetes/kubeconfig \
-          --require-kubeconfig \
-          --client-ca-file=/etc/kubernetes/ca.crt \
+          --allow-privileged \
           --anonymous-auth=false \
+          --client-ca-file=/etc/kubernetes/ca.crt \
+          --cluster_dns=10.3.0.10 \
+          --cluster_domain=cluster.local \
           --cni-conf-dir=/etc/kubernetes/cni/net.d \
-          --network-plugin=cni \
-          --lock-file=/var/run/lock/kubelet.lock \
           --exit-on-lock-contention \
-          --pod-manifest-path=/etc/kubernetes/manifests \
-          --allow-privileged \
           --hostname-override=${COREOS_PUBLIC_IPV4} \
+          --kubeconfig=/etc/kubernetes/kubeconfig \
+          --lock-file=/var/run/lock/kubelet.lock \
+          --network-plugin=cni \
           --node-labels=node-role.kubernetes.io/master \
+          --pod-manifest-path=/etc/kubernetes/manifests \
           --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-          --cluster_dns=10.3.0.10 \
-          --cluster_domain=cluster.local
-
+          --require-kubeconfig
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always
         RestartSec=5

hack/quickstart/kubelet.master

@@ -13,22 +13,22 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests
 ExecStartPre=/bin/mkdir -p /var/lib/cni
 ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
-  --kubeconfig=/etc/kubernetes/kubeconfig \
-  --require-kubeconfig \
-  --client-ca-file=/etc/kubernetes/ca.crt \
+  --allow-privileged \
   --anonymous-auth=false \
+  --client-ca-file=/etc/kubernetes/ca.crt \
+  --cluster_dns=10.3.0.10 \
+  --cluster_domain=cluster.local \
   --cni-conf-dir=/etc/kubernetes/cni/net.d \
-  --network-plugin=cni \
-  --lock-file=/var/run/lock/kubelet.lock \
   --exit-on-lock-contention \
-  --allow-privileged \
   --hostname-override=${COREOS_PRIVATE_IPV4} \
+  --kubeconfig=/etc/kubernetes/kubeconfig \
+  --lock-file=/var/run/lock/kubelet.lock \
+  --minimum-container-ttl-duration=3m0s \
+  --network-plugin=cni \
   --node-labels=node-role.kubernetes.io/master \
+  --pod-manifest-path=/etc/kubernetes/manifests \
   --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-  --cluster_dns=10.3.0.10 \
-  --cluster_domain=cluster.local \
-  --pod-manifest-path=/etc/kubernetes/manifests
-
+  --require-kubeconfig
 ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
 Restart=always
 RestartSec=5

hack/quickstart/kubelet.worker

@@ -11,20 +11,20 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
 ExecStartPre=/bin/mkdir -p /var/lib/cni
 ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
 ExecStart=/usr/lib/coreos/kubelet-wrapper \
-  --kubeconfig=/etc/kubernetes/kubeconfig \
-  --require-kubeconfig \
-  --client-ca-file=/etc/kubernetes/ca.crt \
+  --allow-privileged \
   --anonymous-auth=false \
+  --client-ca-file=/etc/kubernetes/ca.crt \
+  --cluster_dns=10.3.0.10 \
+  --cluster_domain=cluster.local \
   --cni-conf-dir=/etc/kubernetes/cni/net.d \
-  --network-plugin=cni \
-  --lock-file=/var/run/lock/kubelet.lock \
   --exit-on-lock-contention \
-  --allow-privileged \
   --hostname-override=${COREOS_PRIVATE_IPV4} \
-  --cluster_dns=10.3.0.10 \
-  --cluster_domain=cluster.local \
-  --pod-manifest-path=/etc/kubernetes/manifests
-
+  --kubeconfig=/etc/kubernetes/kubeconfig \
+  --lock-file=/var/run/lock/kubelet.lock \
+  --minimum-container-ttl-duration=3m0s \
+  --network-plugin=cni \
+  --pod-manifest-path=/etc/kubernetes/manifests \
+  --require-kubeconfig
 ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
 Restart=always
 RestartSec=5

hack/single-node/user-data.sample

@@ -20,21 +20,20 @@ coreos:
         ExecStartPre=/bin/mkdir -p /var/lib/cni
         ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
         ExecStart=/usr/lib/coreos/kubelet-wrapper \
-          --kubeconfig=/etc/kubernetes/kubeconfig \
-          --require-kubeconfig \
-          --client-ca-file=/etc/kubernetes/ca.crt \
+          --allow-privileged \
           --anonymous-auth=false \
+          --client-ca-file=/etc/kubernetes/ca.crt \
+          --cluster_dns=10.3.0.10 \
+          --cluster_domain=cluster.local \
           --cni-conf-dir=/etc/kubernetes/cni/net.d \
-          --network-plugin=cni \
-          --lock-file=/var/run/lock/kubelet.lock \
           --exit-on-lock-contention=true \
-          --allow-privileged \
-          --pod-manifest-path=/etc/kubernetes/manifests \
           --hostname-override=${COREOS_PUBLIC_IPV4} \
+          --kubeconfig=/etc/kubernetes/kubeconfig \
+          --lock-file=/var/run/lock/kubelet.lock \
+          --network-plugin=cni \
           --node-labels=node-role.kubernetes.io/master \
-          --cluster_dns=10.3.0.10 \
-          --cluster_domain=cluster.local
-
+          --pod-manifest-path=/etc/kubernetes/manifests \
+          --require-kubeconfig
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always
         RestartSec=5