Merge pull request #376 from hongchaodeng/f

*: fix etcd and kenc container command

Author: aaronlevy

pkg/asset/internal/templates.go

@@ -232,9 +232,10 @@ spec:
           name: var-lock
           readOnly: false
         command:
-        - "/bin/sh"
-        - "-c"
-        - "/usr/bin/flock --exclusive --timeout=30 /var/lock/kenc.lock; kenc -r -m iptables && kenc -m iptables"
+        - /usr/bin/flock
+        - /var/lock/kenc.lock
+        - -c
+        - "kenc -r -m iptables && kenc -m iptables"
       volumes:
       - name: checkpoint-dir
         hostPath:

pkg/util/etcdutil/start_etcd.go

@@ -45,18 +45,16 @@ metadata:
 spec:
   containers:
   - command:
-    - /bin/sh
-    - -c
     - /usr/local/bin/etcd
-      --name boot-etcd
-      --listen-client-urls=http://0.0.0.0:12379
-      --listen-peer-urls=http://0.0.0.0:12380
-      --advertise-client-urls=http://$(MY_POD_IP):12379
-      --initial-advertise-peer-urls http://$(MY_POD_IP):12380
-      --initial-cluster boot-etcd=http://$(MY_POD_IP):12380
-      --initial-cluster-token bootkube
-      --initial-cluster-state new
-      --data-dir=/var/etcd/data
+    - --name=boot-etcd
+    - --listen-client-urls=http://0.0.0.0:12379
+    - --listen-peer-urls=http://0.0.0.0:12380
+    - --advertise-client-urls=http://$(MY_POD_IP):12379
+    - --initial-advertise-peer-urls=http://$(MY_POD_IP):12380
+    - --initial-cluster=boot-etcd=http://$(MY_POD_IP):12380
+    - --initial-cluster-token=bootkube
+    - --initial-cluster-state=new
+    - --data-dir=/var/etcd/data
     env:
       - name: MY_POD_IP
         valueFrom: