Merge pull request #32404 from caesarxuchao/etcd-2.2.1

Automatic merge from submit-queue

Stick to 2.2.1 etcd

Fixes #32253. See https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245974746. We are sticking with etcd 2.2.1 until we have a recommended rollforward/rollback process for etcd.

See https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245735209 for etcd roadmap.

I guess I also need to build the image like https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245744295, and update build/build-image/cross/VERSION?

@lavalamp @timothysc

cluster/saltbase/salt/etcd/etcd.manifest

@@ -28,7 +28,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '2.3.7') }}",
+    "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '2.2.1') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}

cluster/saltbase/salt/flannel-server/flannel-server.manifest

@@ -75,7 +75,7 @@
             },
             {
                 "name": "etcd-container",
-                "image": "gcr.io/google_containers/etcd:2.3.7",
+                "image": "gcr.io/google_containers/etcd:2.2.1",
                 "command": [
                     "/bin/sh",
                     "-c",