Skip to content

Commit

Permalink
Merge pull request #19 from gzchen008/develop
Browse files Browse the repository at this point in the history
Closes #15
  • Loading branch information
gzchen008 authored Feb 2, 2021
2 parents 4954fcb + 556363e commit b133b9f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion dockin-etcd/conf/install.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# the License.
#
# IP, :server_list=(ip1 ip2 ip3)
server_list=([#dockin_ETCD_SERVER_LIST])
server_list=
8 changes: 4 additions & 4 deletions dockin-master/conf/install.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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]
etcd_list=
6 changes: 3 additions & 3 deletions dockin-worker/conf/install.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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]
master=

0 comments on commit b133b9f

Please sign in to comment.