Merge pull request #461 from hongchaodeng/fix

*: update etcd-operator and etcd version

Author: hongchaodeng

hack/multi-node/etcd-cloud-config.yaml

@@ -13,7 +13,7 @@ coreos:
       - name: 40-etcd-cluster.conf
         content: |
           [Service]
-          Environment="ETCD_IMAGE_TAG=v3.1.0"
+          Environment="ETCD_IMAGE_TAG=v3.1.6"
           Environment="ETCD_NAME={{ETCD_NODE_NAME}}"
           Environment="ETCD_ADVERTISE_CLIENT_URLS=https://$private_ipv4:2379"
           Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://$private_ipv4:2380"

hack/multi-node/user-data.sample

@@ -32,6 +32,7 @@ coreos:
           --allow-privileged \
           --hostname-override=${COREOS_PUBLIC_IPV4} \
           --node-labels=node-role.kubernetes.io/master \
+          --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
           --cluster_dns=10.3.0.10 \
           --cluster_domain=cluster.local
 

hack/quickstart/init-master.sh

@@ -23,7 +23,7 @@ function configure_etcd() {
         mkdir -p /etc/systemd/system/etcd-member.service.d
         cat << EOF > /etc/systemd/system/etcd-member.service.d/10-etcd-member.conf
 [Service]
-Environment="ETCD_IMAGE_TAG=v3.1.0"
+Environment="ETCD_IMAGE_TAG=v3.1.6"
 Environment="ETCD_NAME=controller"
 Environment="ETCD_INITIAL_CLUSTER=controller=https://${COREOS_PRIVATE_IPV4}:2380"
 Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://${COREOS_PRIVATE_IPV4}:2380"

hack/quickstart/kubelet.master

@@ -24,6 +24,7 @@ ExecStart=/usr/lib/coreos/kubelet-wrapper \
   --allow-privileged \
   --hostname-override=${COREOS_PRIVATE_IPV4} \
   --node-labels=node-role.kubernetes.io/master \
+  --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

hack/single-node/user-data-etcd.sample

@@ -4,7 +4,7 @@
         - name: 10-version.conf
           content: |
             [Service]
-            Environment="ETCD_IMAGE_TAG=v3.1.0"
+            Environment="ETCD_IMAGE_TAG=v3.1.6"
             Environment="ETCD_NAME=default"
             Environment="ETCD_INITIAL_CLUSTER=default=https://127.0.0.1:2380"
             Environment="ETCD_INITIAL_ADVERTISE_PEER_URLS=https://127.0.0.1:2380"

pkg/asset/internal/templates.go

@@ -864,7 +864,7 @@ spec:
     spec:
       containers:
       - name: etcd-operator
-        image: quay.io/coreos/etcd-operator:v0.2.4
+        image: quay.io/coreos/etcd-operator:v0.2.5
         env:
         - name: MY_POD_NAMESPACE
           valueFrom:
@@ -906,7 +906,7 @@ metadata:
 spec:
   containers:
   - name: etcd
-    image: quay.io/coreos/etcd:v3.1.0
+    image: quay.io/coreos/etcd:v3.1.6
     command:
     - /usr/local/bin/etcd
     - --name=boot-etcd

pkg/util/etcdutil/migrate.go

@@ -126,11 +126,18 @@ func createMigratedEtcdCluster(restclient restclient.Interface, podIP string) er
   },
   "spec": {
     "size": 1,
-    "version": "v3.1.0",
+    "version": "v3.1.6",
     "pod": {
       "nodeSelector": {
         "node-role.kubernetes.io/master": ""
-      }
+      },
+      "tolerations": [
+        {
+          "key": "node-role.kubernetes.io/master",
+          "operator": "Exists",
+          "effect": "NoSchedule"
+        }
+      ]
     },
     "selfHosted": {
       "bootMemberClientEndpoint": "http://%s:12379"