Update to shift etcd 2.2 references to use 3.0.3

Timothy St. Clair · Timothy St. Clair · commit 456c43c22d91 · 2016-08-09T08:51:15.000-05:00
diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
@@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \
             github.com/jteeuwen/go-bindata/go-bindata
 
 # Download and symlink etcd. We need this for our integration tests.
-RUN export ETCD_VERSION=v2.2.1; \
+RUN export ETCD_VERSION=v3.0.3; \
   mkdir -p /usr/local/src/etcd \
   && cd /usr/local/src/etcd \
   && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \
diff --git a/cluster/centos/config-build.sh b/cluster/centos/config-build.sh
@@ -23,7 +23,7 @@ RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
 FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
 
 # Define etcd version to use.
-ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}
+ETCD_VERSION=${ETCD_VERSION:-"3.0.3"}
 
 # Define k8s version to use.
 K8S_VERSION=${K8S_VERSION:-"1.1.1"}
diff --git a/cluster/gce/coreos/kube-manifests/etcd-events.yaml b/cluster/gce/coreos/kube-manifests/etcd-events.yaml
@@ -14,7 +14,7 @@ spec:
       --listen-client-urls=http://127.0.0.1:4002
       --data-dir=/var/etcd/data-events
       1>>/var/log/etcd-events.log 2>&1
-    image: gcr.io/google_containers/etcd:2.2.1
+    image: gcr.io/google_containers/etcd:3.0.3
     imagePullPolicy: IfNotPresent
     livenessProbe:
       httpGet:
diff --git a/cluster/gce/coreos/kube-manifests/etcd.yaml b/cluster/gce/coreos/kube-manifests/etcd.yaml
@@ -14,7 +14,7 @@ spec:
       --listen-client-urls=http://127.0.0.1:4001
       --data-dir=/var/etcd/data
       1>>/var/log/etcd.log 2>&1
-    image: gcr.io/google_containers/etcd:2.2.1
+    image: gcr.io/google_containers/etcd:3.0.3
     imagePullPolicy: IfNotPresent
     livenessProbe:
       httpGet:
diff --git a/cluster/images/hyperkube/static-pods/etcd.json b/cluster/images/hyperkube/static-pods/etcd.json
@@ -10,7 +10,7 @@
     "containers": [
       {
         "name": "etcd",
-        "image": "gcr.io/google_containers/etcd-ARCH:2.2.5",
+        "image": "gcr.io/google_containers/etcd-ARCH:3.0.3",
         "command": [
                 "/usr/local/bin/etcd",
                 "--listen-client-urls=http://127.0.0.1:4001",
diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -27,7 +27,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:2.2.1",
+    "image": "gcr.io/google_containers/etcd:3.0.3",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}
diff --git a/cluster/saltbase/salt/flannel-server/flannel-server.manifest b/cluster/saltbase/salt/flannel-server/flannel-server.manifest
@@ -75,7 +75,7 @@
             },
             {
                 "name": "etcd-container",
-                "image": "gcr.io/google_containers/etcd:2.2.1",
+                "image": "gcr.io/google_containers/etcd:3.0.3",
                 "command": [
                     "/bin/sh",
                     "-c",
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
@@ -16,7 +16,7 @@
 
 # A set of helpers for starting/running etcd for tests
 
-ETCD_VERSION=${ETCD_VERSION:-2.2.1}
+ETCD_VERSION=${ETCD_VERSION:-3.0.3}
 ETCD_HOST=${ETCD_HOST:-127.0.0.1}
 ETCD_PORT=${ETCD_PORT:-4001}
 
diff --git a/test/e2e_node/environment/setup_host.sh b/test/e2e_node/environment/setup_host.sh
@@ -55,11 +55,11 @@ fi
 # Install etcd
 hash etcd 2>/dev/null
 if [ $? -ne 0 ]; then
-  curl -L  https://github.com/coreos/etcd/releases/download/v2.2.5/etcd-v2.2.5-linux-amd64.tar.gz -o etcd-v2.2.5-linux-amd64.tar.gz
-  tar xzvf etcd-v2.2.5-linux-amd64.tar.gz
-  sudo mv etcd-v2.2.5-linux-amd64/etcd* /usr/local/bin/
+  curl -L  https://github.com/coreos/etcd/releases/download/v3.0.3/etcd-v3.0.3-linux-amd64.tar.gz -o etcd-v3.0.3-linux-amd64.tar.gz
+  tar xzvf etcd-v3.0.3-linux-amd64.tar.gz
+  sudo mv etcd-v3.0.3-linux-amd64/etcd* /usr/local/bin/
   sudo chown root:root /usr/local/bin/etcd*
-  rm -r etcd-v2.2.5-linux-amd64*
+  rm -r etcd-v3.0.3-linux-amd64*
 fi
 
 # Install nsenter for ubuntu images
diff --git a/test/e2e_node/jenkins/gci-init.yaml b/test/e2e_node/jenkins/gci-init.yaml
@@ -2,7 +2,7 @@
 
 runcmd:
   - mount /tmp /tmp -o remount,exec,suid
-  - ETCD_VERSION=v2.2.5
+  - ETCD_VERSION=v3.0.3
   - curl -L https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -o /tmp/etcd.tar.gz
   - tar xzvf /tmp/etcd.tar.gz -C /tmp
   - cp /tmp/etcd-${ETCD_VERSION}-linux-amd64/etcd* /tmp/
diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh
@@ -20,14 +20,14 @@ EVENT_STORE_IP=$1
 EVENT_STORE_URL="http://${EVENT_STORE_IP}:4002"
 NUM_NODES=$2
 if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
-	sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
+	sudo docker run --net=host -d gcr.io/google_containers/etcd:3.0.3 /usr/local/bin/etcd \
 		--listen-peer-urls http://127.0.0.1:2381 \
 		--advertise-client-urls=http://127.0.0.1:4002 \
 		--listen-client-urls=http://0.0.0.0:4002 \
 		--data-dir=/var/etcd/data
 fi
 
-sudo docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd \
+sudo docker run --net=host -d gcr.io/google_containers/etcd:3.0.3 /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://0.0.0.0:4001 \

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"containers": [`
`11`	`11`	`{`
`12`	`12`	`"name": "etcd",`
`13`		`- "image": "gcr.io/google_containers/etcd-ARCH:2.2.5",`
	`13`	`+ "image": "gcr.io/google_containers/etcd-ARCH:3.0.3",`
`14`	`14`	`"command": [`
`15`	`15`	`"/usr/local/bin/etcd",`
`16`	`16`	`"--listen-client-urls=http://127.0.0.1:4001",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"containers":[`
`28`	`28`	`{`
`29`	`29`	`"name": "etcd-container",`
`30`		`- "image": "gcr.io/google_containers/etcd:2.2.1",`
	`30`	`+ "image": "gcr.io/google_containers/etcd:3.0.3",`
`31`	`31`	`"resources": {`
`32`	`32`	`"requests": {`
`33`	`33`	`"cpu": {{ cpulimit }}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`"name": "etcd-container",`
`78`		`- "image": "gcr.io/google_containers/etcd:2.2.1",`
	`78`	`+ "image": "gcr.io/google_containers/etcd:3.0.3",`
`79`	`79`	`"command": [`
`80`	`80`	`"/bin/sh",`
`81`	`81`	`"-c",`