Merge branch 'hotfix/1.0.5' into develop

pblaas · Sep 25, 2017 · 1a29feb · 1a29feb
2 parents 32506de + b785d5b
commit 1a29feb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/add_node.sh b/add_node.sh
@@ -70,6 +70,7 @@ sed -e "s,WORKER_IP,$i,g" \
 -e "s,USER_CORE_SSHKEY1,${USER_CORE_KEY1}," \
 -e "s,USER_CORE_SSHKEY2,${USER_CORE_KEY2}," \
 -e "s,USER_CORE_PASSWORD,${HASHED_USER_CORE_PASSWORD},g" \
+-e "s,CLOUD_PROVIDER,${CLOUD_PROVIDER},g" \
 -e "s,K8S_VER,$K8S_VER,g" \
 -e "s,\<CACERT\>,$CACERT,g" \
 -e "s,\<WORKERKEY\>,`cat index.txt|grep -w WORKERKEY_$i|cut -d: -f2`,g" \

diff --git a/config.env.sample b/config.env.sample
@@ -10,8 +10,9 @@ K8S_VER=v1.7.6_coreos.0
 K8S_SERVICE_IP=10.3.0.1
 DNSSERVER=8.8.8.8
 CLUSTER_DNS=10.3.0.10
+CLOUD_PROVIDER=
 SERVICE_CLUSTER_IP_RANGE=10.3.0.0/24
-ETCD_ENDPOINTS_URLS=http://192.168.2.10:2379,http://192.168.2.20:2379,http://192.168.2.21:2379
+ETCD_ENDPOINTS_URLS=https://192.168.2.10:2379,https://192.168.2.20:2379,https://192.168.2.21:2379
 USER_CORE_PASSWORD=s@iling
 USER_CORE_KEY1="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDlVWpAjJGhyyYnJxmGf6UHSs7mr4he47uovH6noiVyk/qUgreNQH5F/WVGPcRGqtE8Mc1aonDtWSjxxRlT62x3M9rkP4px48dTigUUFPGhhDTeEjyTqKbzedo/17T0CHVjuQkXl9+m/I7AZPmPBaJEb4knkr++B6tnZa65MjA98w=="
 USER_CORE_KEY2="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDlVWpAjJGhyyYnJxmGf6UHSs7mr4he47uovH6noiVyk/qUgreNQH5F/WVGPcRGqtE8Mc1aonDtWSjxxRlT62x3M9rkP4px48dTigUUFPGhhDTeEjyTqKbzedo/17T0CHVjuQkXl9+m/I7AZPmPBaJEb4knkr++B6tnZa65MjA98w=="
diff --git a/create_cloudinit.sh b/create_cloudinit.sh
@@ -142,6 +142,7 @@ sed -e "s,MASTER_HOST_FQDN,$MASTER_HOST_FQDN,g" \
 -e "s,USER_CORE_SSHKEY1,${USER_CORE_KEY1}," \
 -e "s,USER_CORE_SSHKEY2,${USER_CORE_KEY2}," \
 -e "s,USER_CORE_PASSWORD,$HASHED_USER_CORE_PASSWORD,g" \
+-e "s,CLOUD_PROVIDER,${CLOUD_PROVIDER},g" \
 -e "s,K8S_VER,$K8S_VER,g" \
 -e "s,\<CACERT\>,$CACERT,g" \
 -e "s,\<APISERVERKEY\>,$APISERVERKEY,g" \
@@ -166,6 +167,7 @@ sed -e "s,WORKER_IP,$i,g" \
 -e "s,USER_CORE_SSHKEY1,${USER_CORE_KEY1}," \
 -e "s,USER_CORE_SSHKEY2,${USER_CORE_KEY2}," \
 -e "s,USER_CORE_PASSWORD,$HASHED_USER_CORE_PASSWORD,g" \
+-e "s,CLOUD_PROVIDER,${CLOUD_PROVIDER},g" \
 -e "s,K8S_VER,$K8S_VER,g" \
 -e "s,\<CACERT\>,$CACERT,g" \
 -e "s,\<WORKERKEY\>,`cat index.txt|grep -w WORKERKEY_$i|cut -d: -f2`,g" \

diff --git a/template/controller.yaml b/template/controller.yaml
@@ -85,7 +85,7 @@ coreos:
         --cluster_domain=cluster.local \
         --client-ca-file=/etc/kubernetes/ssl/ca.pem \
         --anonymous-auth=false \
-        --cloud-provider=openstack \
+        --cloud-provider=CLOUD_PROVIDER \
         --cloud-config=/etc/kubernetes/cloud.conf
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always
@@ -287,7 +287,7 @@ write_files:
           - --kubelet-client-certificate=/etc/kubernetes/ssl/apiserver.pem
           - --kubelet-client-key=/etc/kubernetes/ssl/apiserver-key.pem
           - --anonymous-auth=false
-          - --cloud-provider=openstack
+          - --cloud-provider=CLOUD_PROVIDER
           - --cloud-config=/etc/kubernetes/ssl/cloud.conf
           livenessProbe:
             httpGet:
@@ -368,7 +368,7 @@ write_files:
           - --leader-elect=true
           - --service-account-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
           - --root-ca-file=/etc/kubernetes/ssl/ca.pem
-          - --cloud-provider=openstack
+          - --cloud-provider=CLOUD_PROVIDER
           - --cloud-config=/etc/kubernetes/ssl/cloud.conf
           resources:
             requests:

diff --git a/template/worker.yaml b/template/worker.yaml
@@ -88,7 +88,7 @@ coreos:
         --tls-private-key-file=/etc/kubernetes/ssl/worker-key.pem \
         --client-ca-file=/etc/kubernetes/ssl/ca.pem \
         --anonymous-auth=false \
-        --cloud-provider=openstack \
+        --cloud-provider=CLOUD_PROVIDER \
         --cloud-config=/etc/kubernetes/ssl/cloud.conf
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always

diff --git a/template/worker_proxy.yaml b/template/worker_proxy.yaml
@@ -88,7 +88,7 @@ coreos:
         --tls-private-key-file=/etc/kubernetes/ssl/worker-key.pem \
         --client-ca-file=/etc/kubernetes/ssl/ca.pem \
         --anonymous-auth=false \
-        --cloud-provider=openstack \
+        --cloud-provider=CLOUD_PROVIDER \
         --cloud-config=/etc/kubernetes/ssl/cloud.conf
         ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
         Restart=always