Merge branch 'feature/variable_flanneld_version' into develop

pblaas · Oct 13, 2017 · b7c8a07 · b7c8a07
2 parents 7d312d3 + 9212af3
commit b7c8a07
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 0 deletions.
diff --git a/add_node.sh b/add_node.sh
@@ -79,6 +79,7 @@ sed -e "s,WORKER_IP,$i,g" \
 -e "s,ETCDWORKERKEY,`cat index.txt|grep -w ETCDWORKERKEY_$i|cut -d: -f2`,g" \
 -e "s,ETCDWORKER,`cat index.txt|grep -w ETCDWORKER_$i|cut -d: -f2`,g" \
 -e "s,CLOUDCONF,`cat index.txt|grep -w CLOUDCONF|cut -d: -f2`,g" \
+-e "s,FLANNEL_VER,$FLANNEL_VER,g" \
 ../template/worker_proxy.yaml > node_$i.yaml
 echo Generated: node_$i.yaml
 done

diff --git a/config.env.sample b/config.env.sample
@@ -7,6 +7,7 @@ WORKER_IP1=192.168.2.20
 WORKER_IP2=192.168.2.21
 WORKER_HOSTS=(192.168.2.20 192.168.2.21)
 K8S_VER=v1.7.6_coreos.0
+FLANNEL_VER=v0.7.1
 K8S_SERVICE_IP=10.3.0.1
 DNSSERVER=8.8.8.8
 CLUSTER_DNS=10.3.0.10

diff --git a/create_cloudinit.sh b/create_cloudinit.sh
@@ -151,6 +151,7 @@ sed -e "s,MASTER_HOST_FQDN,$MASTER_HOST_FQDN,g" \
 -e "s,ETCDAPISERVERKEY,$ETCDAPISERVERKEY,g" \
 -e "s,ETCDAPISERVER,$ETCDAPISERVER,g" \
 -e "s,CLOUDCONF,$CLOUDCONF,g" \
+-e "s,FLANNEL_VER,$FLANNEL_VER,g" \
 ../template/controller.yaml > node_$MASTER_HOST_IP.yaml
 echo ----------------------
 echo Generated: Master: node_$MASTER_HOST_IP.yaml
@@ -176,6 +177,7 @@ sed -e "s,WORKER_IP,$i,g" \
 -e "s,ETCDWORKERKEY,`cat index.txt|grep -w ETCDWORKERKEY_$i|cut -d: -f2`,g" \
 -e "s,ETCDWORKER,`cat index.txt|grep -w ETCDWORKER_$i|cut -d: -f2`,g" \
 -e "s,CLOUDCONF,$CLOUDCONF,g" \
+-e "s,FLANNEL_VER,$FLANNEL_VER,g" \
 ../template/worker.yaml > node_$i.yaml
 echo Generated: Worker: node_$i.yaml
 done

diff --git a/template/controller.yaml b/template/controller.yaml
@@ -251,6 +251,7 @@ write_files:
       FLANNELD_ETCD_KEYFILE=/etc/ssl/certs/etcd-apiserver-key.pem
       FLANNELD_ETCD_CERTFILE=/etc/ssl/certs/etcd-apiserver.pem
       FLANNELD_ETCD_CAFILE=/etc/ssl/certs/etcd-ca.pem
+      FLANNEL_IMAGE_TAG=FLANNEL_VER
   - path: "/etc/kubernetes/manifests/kube-apiserver.yaml"
     permissions: "0644"
     owner: "root"

diff --git a/template/worker.yaml b/template/worker.yaml
@@ -250,6 +250,7 @@ write_files:
       FLANNELD_ETCD_KEYFILE=/etc/ssl/certs/etcd-worker-key.pem
       FLANNELD_ETCD_CERTFILE=/etc/ssl/certs/etcd-worker.pem
       FLANNELD_ETCD_CAFILE=/etc/ssl/certs/etcd-ca.pem
+      FLANNEL_IMAGE_TAG=FLANNEL_VER
   - path: "/etc/kubernetes/manifests/kube-proxy.yaml"
     permissions: "0644"
     owner: "root"

diff --git a/template/worker_proxy.yaml b/template/worker_proxy.yaml
@@ -250,6 +250,7 @@ write_files:
       FLANNELD_ETCD_KEYFILE=/etc/ssl/certs/etcd-worker-key.pem
       FLANNELD_ETCD_CERTFILE=/etc/ssl/certs/etcd-worker.pem
       FLANNELD_ETCD_CAFILE=/etc/ssl/certs/etcd-ca.pem
+      FLANNEL_IMAGE_TAG=FLANNEL_VER
   - path: "/etc/kubernetes/manifests/kube-proxy.yaml"
     permissions: "0644"
     owner: "root"