diff --git a/README.md b/README.md index 90f1100..2a4b18c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ - **Alibaba Linux** 2.1903, 3.2104([notes](docs/setup/multi_os.md#Alibaba)) - **Alma Linux** 8, 9 -- **Anolis OS** 8.x RHCK, 8.x ANCK([notes](docs/setup/multi_os.md#Anolis)) +- **Anolis OS** 8.x RHCK, 8.x ANCK - **CentOS/RHEL** 7, 8, 9 - **Debian** 10, 11([notes](docs/setup/multi_os.md#Debian)) - **Fedora** 34, 35, 36, 37 diff --git a/docs/mixes/conformance.md b/docs/mixes/conformance.md index 8f98ad5..f5c102b 100644 --- a/docs/mixes/conformance.md +++ b/docs/mixes/conformance.md @@ -4,8 +4,6 @@ CNCF 一致性认证项目(https://github.com/cncf/k8s-conformance) 可以很方 # kubeasz 通过一致性测试 -Cheers! - 自kubeasz 3.0.0 版本,k8s v1.20.2开始,正式通过cncf一致性认证,成为cncf 官方认证安装工具;后续k8s主要版本发布或者kubeasz有大版本更新,会优先确保通过集群一致性认证。 - v1.27 [进行中]() @@ -56,18 +54,18 @@ chmod +x ./ezdown ``` ./ezdown -S -docker exec -it kubeasz ezctl start-aio +source ~/.bashrc +dk ezctl start-aio ``` (3) Add two worker nodes ``` ssh-copy-id ${worker1_ip} -ssh ${worker1_ip} ln -s /usr/bin/python3 /usr/bin/python -docker exec -it kubeasz ezctl add-node default ${worker1_ip} +dk ezctl add-node default ${worker1_ip} + ssh-copy-id ${worker2_ip} -ssh ${worker2_ip} ln -s /usr/bin/python3 /usr/bin/python -docker exec -it kubeasz ezctl add-node default ${worker2_ip} +dk ezctl add-node default ${worker2_ip} ``` ## Run Conformance Test @@ -77,16 +75,12 @@ The standard tool for running these tests is regularly built and kept up to date to execute against all currently supported versions of kubernetes. -Download a [binary release](https://github.com/heptio/sonobuoy/releases) of the CLI, or build it yourself by running: - -``` -$ go get -u -v github.com/heptio/sonobuoy -``` +Download a [binary release](https://github.com/heptio/sonobuoy/releases) of the CLI Deploy a Sonobuoy pod to your cluster with: ``` -$ sonobuoy run --mode=certified-conformance +$ sonobuoy run --plugin-env=e2e.E2E_EXTRA_ARGS="--ginkgo.v" --mode=certified-conformance ``` **NOTE:** You can run the command synchronously by adding the flag `--wait` but be aware that running the Conformance tests can take an hour or more. diff --git a/docs/op/op-etcd.md b/docs/op/op-etcd.md index d26a583..a8cab57 100644 --- a/docs/op/op-etcd.md +++ b/docs/op/op-etcd.md @@ -46,9 +46,6 @@ ezctl backup k8s-01 # ssh 免密码登录 $ ssh-copy-id 192.168.1.11 -# 部分操作系统需要配置python软链接 -$ ssh 192.168.1.11 ln -s /usr/bin/python3 /usr/bin/python - # 新增节点 $ ezctl add-etcd test-k8s 192.168.1.11 ``` diff --git a/docs/op/op-master.md b/docs/op/op-master.md index 40603be..e77573a 100644 --- a/docs/op/op-master.md +++ b/docs/op/op-master.md @@ -20,9 +20,6 @@ # ssh 免密码登录 $ ssh-copy-id 192.168.1.11 -# 部分操作系统需要配置python软链接 -$ ssh 192.168.1.11 ln -s /usr/bin/python3 /usr/bin/python - # 新增节点 $ ezctl add-master test-k8s 192.168.1.11 diff --git a/docs/op/op-node.md b/docs/op/op-node.md index 90df59e..0dd90ba 100644 --- a/docs/op/op-node.md +++ b/docs/op/op-node.md @@ -22,9 +22,6 @@ # ssh 免密码登录 $ ssh-copy-id 192.168.1.11 -# 部分操作系统需要配置python软链接 -$ ssh 192.168.1.11 ln -s /usr/bin/python3 /usr/bin/python - # 新增节点 $ ezctl add-node test-k8s 192.168.1.11 @@ -50,7 +47,6 @@ $ kubectl get pod -n kube-system ``` bash $ ssh-copy-id -p 10022 192.168.2.1 -$ ssh -p10022 192.168.2.1 ln -s /usr/bin/python3 /usr/bin/python $ ezctl add-node test-k8s 192.168.2.1 ansible_ssh_port=10022 ``` diff --git a/docs/setup/00-planning_and_overall_intro.md b/docs/setup/00-planning_and_overall_intro.md index fd9775e..2aeb915 100644 --- a/docs/setup/00-planning_and_overall_intro.md +++ b/docs/setup/00-planning_and_overall_intro.md @@ -50,9 +50,6 @@ ``` bash #$IP为所有节点地址包括自身,按照提示输入yes 和root密码 ssh-copy-id $IP - -# 为每个节点设置python软链接 -ssh $IP ln -s /usr/bin/python3 /usr/bin/python ``` ### 4.在部署节点编排k8s安装 diff --git a/docs/setup/multi_os.md b/docs/setup/multi_os.md index cd16cfa..f15d371 100644 --- a/docs/setup/multi_os.md +++ b/docs/setup/multi_os.md @@ -38,30 +38,13 @@ apt install iptables -y ``` bash # 修改使用dnf包管理 sed -i 's/package/dnf/g' /etc/kubeasz/roles/prepare/tasks/redhat.yml - -# 指定python版本,xxxx为集群名 -source ~/.bashrc -dk ezctl setup xxxx all -e ansible_python_interpreter=/usr/bin/python3 -``` - -## Anolis - -- Anolis OS 8.x RHCK:需要指定python版本 -- Anolis OS 8.x ANCK:需要指定python版本 - -``` bash -source ~/.bashrc -dk ezctl setup xxxx all -e ansible_python_interpreter=/usr/bin/python3 ``` ## openSUSE -- openSUSE Leap 15.4:需要安装iptables和指定python版本 +- openSUSE Leap 15.4:需要安装iptables ``` bash zypper install iptables ln -s /usr/sbin/iptables /sbin/iptables - -source ~/.bashrc -dk ezctl setup xxxx all -e ansible_python_interpreter=/usr/bin/python3 ```