Skip to content

Commit eab1d62

Browse files
committed
translate playbooks comments into english -1
1 parent 8caa842 commit eab1d62

24 files changed

+207
-196
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ manifests/storage/*
1717
roles/cluster-backup/files/*
1818
!roles/cluster-backup/files/readme.md
1919

20-
# roles/xxx/vars, exclude roles/os-harden/vars/
20+
# role based variable settings, exclude roles/os-harden/vars/
2121
/roles/*/vars/*
2222
!/roles/os-harden/vars/

01.prepare.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# 集群内时间同步
1+
# [optional] to synchronize time of nodes with 'chrony'
22
- hosts: all
33
roles:
44
- { role: chrony, when: "hostvars[groups.deploy[0]]['NTP_ENABLED'] == 'yes'" }
55

6-
# 在deploy节点生成CA相关证书
6+
# to create CA, kubeconfig, kube-proxy.kubeconfig etc. on 'deploy' node
77
- hosts: deploy
88
roles:
99
- deploy
1010

11-
# 集群节点的公共配置任务
11+
# prepare tasks for all nodes
1212
- hosts:
1313
- kube-master
1414
- kube-node
@@ -18,7 +18,7 @@
1818
roles:
1919
- prepare
2020

21-
# [可选]多master部署时的负载均衡配置
21+
# [optional] to install loadbalance service, only needed by multi-master cluster
2222
- hosts: lb
2323
roles:
2424
- lb

02.etcd.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# to install etcd cluster
12
- hosts: etcd
23
roles:
34
- etcd

03.docker.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# to install docker service
12
- hosts:
23
- kube-master
34
- kube-node

04.kube-master.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1+
# to set up 'kube-master' nodes
12
- hosts: kube-master
23
roles:
34
- kube-master
45
- kube-node
5-
# 禁止业务 pod调度到 master节点
66
tasks:
7-
- name: 禁止业务 pod调度到 master节点
7+
- name: Making master nodes SchedulingDisabled
88
shell: "{{ bin_dir }}/kubectl cordon {{ inventory_hostname }} "
99
delegate_to: "{{ groups.deploy[0] }}"
1010
when: DEPLOY_MODE != "allinone"
1111
ignore_errors: true
1212

13-
- name: 设置master节点role
13+
- name: Setting master role name
1414
shell: "{{ bin_dir }}/kubectl label node {{ inventory_hostname }} kubernetes.io/role=master --overwrite"
1515
ignore_errors: true
1616
delegate_to: "{{ groups.deploy[0] }}"

05.kube-node.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# to set up 'kube-node' nodes
12
- hosts: kube-node
23
roles:
34
- kube-node

06.network.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 集群网络插件部署,只能选择一种安装
1+
# to install network plugin, only one can be choosen
22
- hosts:
33
- kube-master
44
- kube-node

07.cluster-addon.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# to install clust-addons
12
- hosts:
23
- kube-node
34
roles:

11.harbor.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
# [optional] to set up a HARBOR, and to integrate the HARBOR with k8s cluster
2+
# read the guide: 'guide/harbor.md'
3+
14
- hosts: harbor
25
roles:
36
- { role: chrony, when: "hostvars[groups.deploy[0]]['NTP_ENABLED'] == 'yes' and NEW_INSTALL == 'yes'" }
47
- { role: prepare, when: "NEW_INSTALL == 'yes'" }
58
- { role: docker, when: "NEW_INSTALL == 'yes'" }
69
- { role: harbor, when: "NEW_INSTALL == 'yes'" }
710
tasks:
8-
- name: 获取harbor服务器证书
11+
- name: Fetching the HARBOR SERVER's CA cert
912
fetch:
1013
src: "{{ ca_dir }}/ca.pem"
1114
dest: "{{ base_dir }}/down/"
@@ -19,14 +22,14 @@
1922
vars:
2023
harbor_domain: "{{ hostvars[groups.harbor[0]]['HARBOR_DOMAIN'] }}"
2124
tasks:
22-
- name: harbor证书目录创建
25+
- name: Creating cert dir of the HARBOR SERVER for the docker daemon
2326
file: name=/etc/docker/certs.d/{{ harbor_domain }} state=directory
2427

25-
- name: 推送harbor服务器证书
28+
- name: Installing the HARBOR SERVER's cert on k8s nodes
2629
copy: src={{ base_dir }}/down/ca.pem dest=/etc/docker/certs.d/{{ harbor_domain }}/ca.crt
2730

28-
# 如果你的环境中有dns服务器,可以跳过hosts文件设置
29-
- name: 增加harbor的hosts解析
31+
# [optional] if you have a DNS server, add an 'A record' instead
32+
- name: Adding an '/etc/hosts' entry for the HARBOR DOMAIN
3033
lineinfile:
3134
dest: /etc/hosts
3235
state: present

20.addnode.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- prepare
55
- docker
66
- kube-node
7-
# 根据hosts中配置,以下两种网络只会安装一种
7+
#
88
- { role: calico, when: "CLUSTER_NETWORK == 'calico'" }
99
- { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" }
1010
- { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" }

21.addmaster.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 重新配置启动 haproxy
1+
# reconfigure and restart the haproxy service
22
- hosts: lb
33
roles:
44
- lb
@@ -10,20 +10,20 @@
1010
- docker
1111
- kube-master
1212
- kube-node
13-
# 根据hosts中配置,以下两种网络只会安装一种
13+
#
1414
- { role: calico, when: "CLUSTER_NETWORK == 'calico'" }
1515
- { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" }
1616
- { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" }
1717
- { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" }
18-
# 禁止业务 pod调度到 master节点
18+
#
1919
tasks:
20-
- name: 禁止业务 pod调度到 master节点
20+
- name: Making master nodes SchedulingDisabled
2121
shell: "{{ bin_dir }}/kubectl cordon {{ inventory_hostname }} "
2222
delegate_to: "{{ groups.deploy[0] }}"
2323
when: DEPLOY_MODE != "allinone"
2424
ignore_errors: true
2525

26-
- name: 设置master节点role
26+
- name: Setting master role name
2727
shell: "{{ bin_dir }}/kubectl label node {{ inventory_hostname }} kubernetes.io/role=master --overwrite"
2828
ignore_errors: true
2929
delegate_to: "{{ groups.deploy[0] }}"

22.upgrade.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# 集群更新存在一定风险,请谨慎操作
2-
# 使用命令:ansible-playbook -t upgrade_k8s 22.upgrade.yml
1+
# WARNING: Upgrade the k8s cluster can be risky. Make sure you know what you are doing.
2+
# Read the guide: 'op/upgrade.md' .
33

4-
# 更新kubectl二进制
4+
# update kubectl binary
55
- hosts:
66
- kube-master
77
- kube-node
88
- deploy
99
roles:
1010
- prepare
1111

12-
# 更新etcd集群
12+
# update etcd
1313
- hosts: etcd
1414
roles:
1515
- etcd
1616

17-
# docker更新,为保证不中断业务,不自动重启docker服务
17+
# update docker binary
1818
- hosts:
1919
- kube-master
2020
- new-master
@@ -23,15 +23,15 @@
2323
roles:
2424
- docker
2525

26-
# 更新master节点
26+
# update masters
2727
- hosts:
2828
- kube-master
2929
- new-master
3030
roles:
3131
- kube-master
3232
- kube-node
3333

34-
# 更新node节点
34+
# update nodes
3535
- hosts:
3636
- kube-node
3737
- new-node

23.backup.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# 集群备份脚本,请详细参阅文档 docs/op/cluster_restore.md
1+
# cluster-backup playbook
2+
# read the guide: 'op/cluster_restore.md'
23

34
- hosts:
45
- etcd
@@ -8,14 +9,14 @@
89
- hosts:
910
- deploy
1011
tasks:
11-
- name: 准备备份目录
12+
- name: Creating backup dirs
1213
file: name={{ item }} state=directory
1314
with_items:
1415
- "{{ base_dir }}/roles/cluster-backup/files/ca"
1516
- "{{ base_dir }}/roles/cluster-backup/files/hosts"
1617
- "{{ base_dir }}/roles/cluster-backup/files/snapshot"
1718

18-
- name: 备份 CA 相关文件
19+
- name: Backing up CA sth
1920
copy:
2021
src: "{{ ca_dir }}/{{ item }}"
2122
dest: "{{ base_dir }}/roles/cluster-backup/files/ca/{{ item }}"
@@ -26,25 +27,25 @@
2627
- ca-csr.json
2728
- ca-config.json
2829

29-
- name: 备份 ansible hosts 1
30+
- name: Backing up ansible hosts-1
3031
copy:
3132
src: "{{ base_dir }}/hosts"
3233
dest: "{{ base_dir }}/roles/cluster-backup/files/hosts/hosts"
3334
register: p
3435

35-
- name: 备份 ansible hosts 2
36+
- name: Backing up ansible hosts-2
3637
shell: "cd {{ base_dir }}/roles/cluster-backup/files/hosts && \
3738
cp -fp hosts hosts-$(date +'%Y%m%d%H%M')"
38-
when: p | changed
39+
when: 'p is changed'
3940

40-
- name: 备份 etcd snapshot 1
41+
- name: Backing up etcd snapshot-1
4142
copy:
4243
src: "{{ base_dir }}/roles/cluster-backup/files/snapshot.db"
4344
dest: "{{ base_dir }}/roles/cluster-backup/files/snapshot/snapshot.db"
4445
register: q
4546

46-
- name: 备份 etcd snapshot 2
47+
- name: Backing up etcd snapshot-2
4748
shell: "cd {{ base_dir }}/roles/cluster-backup/files/ && \
4849
mv -f snapshot.db snapshot/snapshot-$(date +'%Y%m%d%H%M').db"
49-
when: q | changed
50+
when: 'q is changed'
5051

24.restore.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
# 集群从备份恢复的脚本,使用请参阅文档 docs/op/cluster_restore.md
1+
# cluster-restore playbook
2+
# read the guide: 'op/cluster_restore.md'
23

3-
# 在deploy节点恢复CA相关证书
4+
# to restore CA sth on 'deploy' node
45
- hosts: deploy
56
tasks:
6-
- name: 恢复CA 文件夹
7+
- name: Restoring dirs of CA sth
78
file: name=/etc/kubernetes/ssl/ state=directory
89

9-
- name: 恢复CA 相关文件
10+
- name: Restoring CA sth
1011
copy:
1112
src: "{{ base_dir }}/roles/cluster-backup/files/ca/{{ item }}"
1213
dest: "{{ ca_dir }}/{{ item }}"
@@ -21,22 +22,22 @@
2122
roles:
2223
- deploy
2324

24-
# 集群节点的公共配置任务
25+
# pre-tasks on all nodes
2526
- hosts: all
2627
roles:
2728
- prepare
2829

29-
# [可选]多master部署时的负载均衡配置
30+
# [optional] only needed by multi-master cluster
3031
- hosts: lb
3132
roles:
3233
- lb
3334

34-
# 创建etcd集群
35+
# to install etcd cluster
3536
- hosts: etcd
3637
roles:
3738
- etcd
3839

39-
# docker服务安装
40+
# to install docker
4041
- hosts:
4142
- kube-master
4243
- kube-node
@@ -45,31 +46,32 @@
4546
roles:
4647
- docker
4748

49+
# to set up 'kube-master' nodes
4850
- hosts:
4951
- kube-master
5052
- new-master
5153
roles:
5254
- kube-master
5355
- kube-node
54-
# 禁止业务 pod调度到 master节点
56+
#
5557
tasks:
56-
- name: 禁止业务 pod调度到 master节点
58+
- name: Making master nodes SchedulingDisabled
5759
shell: "{{ bin_dir }}/kubectl cordon {{ inventory_hostname }} "
5860
when: DEPLOY_MODE != "allinone"
5961
ignore_errors: true
6062

61-
- name: 设置master节点role
63+
- name: Setting master role name
6264
shell: "{{ bin_dir }}/kubectl label node {{ inventory_hostname }} kubernetes.io/role=master --overwrite"
6365
ignore_errors: true
6466

65-
# node 节点部署
67+
# to set up 'kube-node' nodes
6668
- hosts:
6769
- kube-node
6870
- new-node
6971
roles:
7072
- kube-node
7173

72-
# etcd 集群进行数据恢复
74+
# to restore data of etcd cluster
7375
- hosts: etcd
7476
roles:
7577
- cluster-restore

0 commit comments

Comments
 (0)