Moving to quay etcd

contiv · Mar 23, 2017 · b474314 · b474314
1 parent 7a9424e
commit b474314
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -8,7 +8,7 @@ TBD
 	auth_proxy_version=${CONTIV_API_PROXY_VERSION:-"1.0.0-beta.3"}
 	aci_gw_version=${CONTIV_ACI_GW_VERSION:-"latest"}
 	contiv_version=${CONTIV_VERSION:-"1.0.0-beta.3"}
-	etcd_version=${CONTIV_ETCD_VERSION:-2.3.7}
+	etcd_version=${CONTIV_ETCD_VERSION:-v2.3.8}
 	docker_version=${CONTIV_DOCKER_VERSION:-1.12.6}
 	```
 

diff --git a/install/k8s/etcd.yaml b/install/k8s/etcd.yaml
@@ -26,9 +26,24 @@ spec:
       hostNetwork: true
       containers:
         - name: contiv-etcd
-          image: gcr.io/google_containers/etcd:__ETCD_VERSION__
-          command: ["/bin/sh","-c"]
-          args: ["/usr/local/bin/etcd --name=contiv --data-dir=/var/etcd/contiv-data --advertise-client-urls=http://__NETMASTER_IP__:6666 --listen-client-urls=http://0.0.0.0:6666 --listen-peer-urls=http://0.0.0.0:6667"]
+          image: quay.io/coreos/etcd:__ETCD_VERSION__
+          args:
+            - --name
+            - contiv0
+            - --data-dir
+            - /var/etcd/contiv-data
+            - --initial-advertise-peer-urls
+            - http://__NETMASTER_IP__:6667
+            - --listen-peer-urls
+            - http://0.0.0.0:6667
+            - --listen-client-urls
+            - http://0.0.0.0:6666
+            - --advertise-client-urls
+            - http://__NETMASTER_IP__:6666
+            - --initial-cluster
+            - contiv0=http://__NETMASTER_IP__:6667
+            - --initial-cluster-state
+            - new  
           volumeMounts:
             - name: var-etcd
               mountPath: /var/etcd

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -9,7 +9,7 @@ VERSION=${BUILD_VERSION-$DEV_IMAGE_NAME}
 auth_proxy_version=${CONTIV_API_PROXY_VERSION:-"1.0.0-beta.4"}
 aci_gw_version=${CONTIV_ACI_GW_VERSION:-"latest"}
 contiv_version=${CONTIV_VERSION:-"1.0.0-beta.4"}
-etcd_version=${CONTIV_ETCD_VERSION:-2.3.8}
+etcd_version=${CONTIV_ETCD_VERSION:-v2.3.8}
 docker_version=${CONTIV_DOCKER_VERSION:-1.12.6}
 ansible_image_version=${CONTIV_ANSIBLE_IMAGE_VERSION:-"1.0.0-beta.4"}