From dde38e1e37248b1d1f458f7dd8d406fb108214d6 Mon Sep 17 00:00:00 2001 From: gzchen008 Date: Tue, 2 Feb 2021 20:38:15 +0800 Subject: [PATCH 1/2] remove variable template --- README.md | 14 +++++++------- dockin-master/conf/install.properties | 8 ++++---- dockin-worker/conf/install.properties | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3f25fdc..83db65e 100755 --- a/README.md +++ b/README.md @@ -75,13 +75,13 @@ sudo ./install.sh - Configuration file:conf/install.properties ``` -ip=[@HOSTIP] +ip= # Token added to the cluster, generated by the master script -token=[#join-token] +token= # Master ApiServer IP/VIP -master=[#master-vip] +master= ``` - Install Command @@ -101,17 +101,17 @@ sudo ./install.sh install v1.16.6 master_node=true ``` # master HA VIP -master_vip=[#MASTER_VIP] +master_vip= # masterIP and VIP -master_ip_list=[#MASTER_IP_LIST] +master_ip_list= # local IP -local_ip=[@HOSTIP] +local_ip= # etcd list, eg: https://ip1:port1,https://ip2:port2,https://ip3:port3; # Please note that the port of dockin-etcd is 5379 -etcd_list=[#ETCD_LIST] +etcd_list= ``` - ETCD Certificate path:/etc/kubernetes/pki/etcd/ diff --git a/dockin-master/conf/install.properties b/dockin-master/conf/install.properties index 4764726..1171e19 100755 --- a/dockin-master/conf/install.properties +++ b/dockin-master/conf/install.properties @@ -13,10 +13,10 @@ # # master HA VIP -master_vip=[#MASTER_VIP] +master_vip= # masterIP and VIP -master_ip_list=[#MASTER_IP_LIST] +master_ip_list= # IP -local_ip=[@HOSTIP] +local_ip= # etcd list, eg: https://ip1:port1,https://ip2:port2,https://ip3:port3; -etcd_list=[#ETCD_LIST] \ No newline at end of file +etcd_list= \ No newline at end of file diff --git a/dockin-worker/conf/install.properties b/dockin-worker/conf/install.properties index bbfa889..de37741 100755 --- a/dockin-worker/conf/install.properties +++ b/dockin-worker/conf/install.properties @@ -16,11 +16,11 @@ # # Node IP -ip=[@HOSTIP] +ip= # master,Node join # token,master -token=[#join-token] +token= # Master ApiServer IP/VIP -master=[#master-vip] \ No newline at end of file +master= \ No newline at end of file From 556363ea5aa2b75a9e0c3f92028dac60c120f9c0 Mon Sep 17 00:00:00 2001 From: gzchen008 Date: Tue, 2 Feb 2021 20:39:15 +0800 Subject: [PATCH 2/2] remove variable template --- dockin-etcd/conf/install.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockin-etcd/conf/install.properties b/dockin-etcd/conf/install.properties index 0cf678c..55766d8 100755 --- a/dockin-etcd/conf/install.properties +++ b/dockin-etcd/conf/install.properties @@ -12,4 +12,4 @@ # the License. # # IP, :server_list=(ip1 ip2 ip3) -server_list=([#dockin_ETCD_SERVER_LIST]) \ No newline at end of file +server_list= \ No newline at end of file