增加随机basic auth密码等脚本优化

tmhna · Feb 25, 2019 · 4c6ec53 · 4c6ec53
1 parent d6ed23c
commit 4c6ec53
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 8 deletions.
diff --git a/example/hosts.allinone.example b/example/hosts.allinone.example
@@ -56,7 +56,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # 集群 DNS 域名
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# 集群basic auth 使用的用户名和密码
+# 集群basic auth 使用的用户名和密码 (运行时会生成随机密码)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.allinone.example.en b/example/hosts.allinone.example.en
@@ -57,7 +57,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # Cluster DNS Domain
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# Basic auth for apiserver
+# Basic auth for apiserver (a random password will be gennerated on cluster setup)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.cloud.example b/example/hosts.cloud.example
@@ -56,7 +56,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # 集群 DNS 域名
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# 集群basic auth 使用的用户名和密码
+# 集群basic auth 使用的用户名和密码 (运行时会生成随机密码)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.cloud.example.en b/example/hosts.cloud.example.en
@@ -57,7 +57,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # Cluster DNS Domain
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# Basic auth for apiserver
+# Basic auth for apiserver (a random password will be gennerated on cluster setup)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.m-masters.example b/example/hosts.m-masters.example
@@ -66,7 +66,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # 集群 DNS 域名
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# 集群basic auth 使用的用户名和密码
+# 集群basic auth 使用的用户名和密码 (运行时会生成随机密码)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.m-masters.example.en b/example/hosts.m-masters.example.en
@@ -67,7 +67,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # Cluster DNS Domain
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# Basic auth for apiserver
+# Basic auth for apiserver (a random password will be gennerated on cluster setup)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.s-master.example b/example/hosts.s-master.example
@@ -57,7 +57,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # 集群 DNS 域名
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# 集群basic auth 使用的用户名和密码
+# 集群basic auth 使用的用户名和密码 (运行时会生成随机密码)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/example/hosts.s-master.example.en b/example/hosts.s-master.example.en
@@ -58,7 +58,7 @@ CLUSTER_DNS_SVC_IP="10.68.0.2"
 # Cluster DNS Domain
 CLUSTER_DNS_DOMAIN="cluster.local."
 
-# Basic auth for apiserver
+# Basic auth for apiserver (a random password will be gennerated on cluster setup)
 BASIC_AUTH_USER="admin"
 BASIC_AUTH_PASS="test1234"
 

diff --git a/roles/calico/tasks/main.yml b/roles/calico/tasks/main.yml
@@ -105,3 +105,4 @@
   delegate_to: "{{ groups.deploy[0] }}"
   retries: 15
   delay: 15
+  ignore_errors: true
diff --git a/roles/cilium/tasks/main.yml b/roles/cilium/tasks/main.yml
@@ -96,3 +96,4 @@
   delegate_to: "{{ groups.deploy[0] }}"
   retries: 15
   delay: 8
+  ignore_errors: true
diff --git a/roles/deploy/tasks/main.yml b/roles/deploy/tasks/main.yml
@@ -32,6 +32,12 @@
   when: p.stat.isreg is not defined
   shell: "cd {{ ca_dir }} && {{ bin_dir }}/cfssl gencert -initca ca-csr.json | {{ bin_dir }}/cfssljson -bare ca" 
 
+# 随机生成集群 basic auth 使用的密码
+- name: 生成随机 basic auth 密码
+  shell: 'export PWD=`date +%s%N | md5sum | head -c 16`; sed -i "s/^BASIC_AUTH_PASS.*$/BASIC_AUTH_PASS=\"$PWD\"/g" {{ base_dir }}/hosts'
+  connection: local
+  when: p.stat.isreg is not defined
+
 #----------- 创建kubectl kubeconfig文件: /root/.kube/config
 - name: 准备kubectl使用的admin 证书签名请求
   template: src=admin-csr.json.j2 dest={{ ca_dir }}/admin-csr.json

diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml
@@ -68,4 +68,5 @@
   delegate_to: "{{ groups.deploy[0] }}"
   retries: 15
   delay: 8
+  ignore_errors: true
 
diff --git a/roles/kube-router/tasks/main.yml b/roles/kube-router/tasks/main.yml
@@ -85,4 +85,5 @@
   delegate_to: "{{ groups.deploy[0] }}"
   retries: 15
   delay: 8
+  ignore_errors: true