Update etcd default ports for v3, and validate tests

cluster/gce/coreos/configure-node.sh

@@ -88,7 +88,7 @@ function configure-kube-apiserver() {
   echo "Configuring kube-apiserver"
   
   # Wait for etcd to be up.
-  wait-url-up http://127.0.0.1:4001/version
+  wait-url-up http://127.0.0.1:2379/version
 
   touch /var/log/kube-apiserver.log
 

cluster/gce/coreos/kube-manifests/etcd.yaml

@@ -10,8 +10,8 @@ spec:
     - -c
     - /usr/local/bin/etcd
       --listen-peer-urls=http://127.0.0.1:2380
-      --advertise-client-urls=http://127.0.0.1:4001
-      --listen-client-urls=http://127.0.0.1:4001
+      --advertise-client-urls=http://127.0.0.1:2379
+      --listen-client-urls=http://127.0.0.1:2379
       --data-dir=/var/etcd/data
       1>>/var/log/etcd.log 2>&1
     image: gcr.io/google_containers/etcd:3.0.4
@@ -20,7 +20,7 @@ spec:
       httpGet:
         host: 127.0.0.1
         path: /health
-        port: 4001
+        port: 2379
         scheme: HTTP
       initialDelaySeconds: 15
       timeoutSeconds: 15
@@ -30,8 +30,8 @@ spec:
       hostPort: 2380
       name: serverport
       protocol: TCP
-    - containerPort: 4001
-      hostPort: 4001
+    - containerPort: 2379
+      hostPort: 2379
       name: clientport
       protocol: TCP
     resources:

cluster/gce/coreos/kube-manifests/kube-apiserver.yaml

@@ -10,7 +10,7 @@ spec:
     - -c
     - /usr/local/bin/kube-apiserver
       --address=127.0.0.1
-      --etcd-servers=http://127.0.0.1:4001
+      --etcd-servers=http://127.0.0.1:2379
       --etcd-servers-overrides=/events#http://127.0.0.1:4002 
       --cloud-provider=gce
       --admission-control=${ADMISSION_CONTROL}

cluster/gce/gci/configure-helper.sh

@@ -571,7 +571,7 @@ function start-etcd-servers {
     rm -f /etc/init.d/etcd
   fi
   prepare-log-file /var/log/etcd.log
-  prepare-etcd-manifest "" "4001" "2380" "200m" "etcd.manifest"
+  prepare-etcd-manifest "" "2379" "2380" "200m" "etcd.manifest"
 
   prepare-log-file /var/log/etcd-events.log
   prepare-etcd-manifest "-events" "4002" "2381" "100m" "etcd-events.manifest"
@@ -630,7 +630,7 @@ function start-kube-apiserver {
   params+=" --basic-auth-file=/etc/srv/kubernetes/basic_auth.csv"
   params+=" --cloud-provider=gce"
   params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt"
-  params+=" --etcd-servers=http://127.0.0.1:4001"
+  params+=" --etcd-servers=http://127.0.0.1:2379"
   params+=" --etcd-servers-overrides=/events#http://127.0.0.1:4002"
   params+=" --secure-port=443"
   params+=" --tls-cert-file=/etc/srv/kubernetes/server.cert"

cluster/gce/trusty/configure-helper.sh

@@ -452,7 +452,7 @@ start_etcd_servers() {
     rm -f /etc/init.d/etcd
   fi
   prepare_log_file /var/log/etcd.log
-  prepare_etcd_manifest "" "4001" "2380" "200m" "etcd.manifest"
+  prepare_etcd_manifest "" "2379" "2380" "200m" "etcd.manifest"
 
   prepare_log_file /var/log/etcd-events.log
   prepare_etcd_manifest "-events" "4002" "2381" "100m" "etcd-events.manifest"
@@ -508,7 +508,7 @@ start_kube_apiserver() {
   params="${APISERVER_TEST_ARGS:-} ${API_SERVER_TEST_LOG_LEVEL:-"--v=2"} ${CLOUD_CONFIG_OPT}"
   params="${params} --cloud-provider=gce"
   params="${params} --address=127.0.0.1"
-  params="${params} --etcd-servers=http://127.0.0.1:4001"
+  params="${params} --etcd-servers=http://127.0.0.1:2379"
   params="${params} --tls-cert-file=/etc/srv/kubernetes/server.cert"
   params="${params} --tls-private-key-file=/etc/srv/kubernetes/server.key"
   params="${params} --secure-port=443"