15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update docs 

Signed-off-by: pixiake <guofeng@yunify.com>
This commit is contained in:
pixiake 2021-08-24 22:44:24 +08:00
parent e879bd095d
commit eb47a0a2b8
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -35,12 +35,12 @@ There are three scenarios to use KubeKey.
### <span id = "KubernetesVersions">Kubernetes Versions</span>
* **v1.15**: &ensp; *v1.15.12*
* **v1.16**: &ensp; *v1.16.13*
* **v1.17**: &ensp; *v1.17.9*
* **v1.18**: &ensp; *v1.18.6*
* **v1.19**: &ensp; *v1.19.8* (default)
* **v1.20**: &ensp; *v1.20.4*
* **v1.20**: &ensp; *v1.20.6*
* **v1.21**: &ensp; *v1.21.4*
* **v1.22**: &ensp; *v1.22.1*
> Looking for more supported versions [Click here](./docs/kubernetes-versions.md)
## Requirements and Recommendations

6
README_zh-CN.md
View File

@ -35,12 +35,12 @@
### <span id = "KubernetesVersions">Kubernetes 版本</span>
* **v1.15**: &ensp; *v1.15.12*
* **v1.16**: &ensp; *v1.16.13*
* **v1.17**: &ensp; *v1.17.9*
* **v1.18**: &ensp; *v1.18.6*
* **v1.19**: &ensp; *v1.19.8* (default)
* **v1.20**: &ensp; *v1.20.4*
* **v1.20**: &ensp; *v1.20.6*
* **v1.21**: &ensp; *v1.21.4*
* **v1.22**: &ensp; *v1.22.1*
> 查看更多支持的版本[点击这里](./docs/kubernetes-versions.md)
## 要求和建议

1
apis/kubekey/v1alpha1/default.go
View File

@ -216,6 +216,7 @@ func SetDefaultNetworkCfg(cfg *ClusterSpec) NetworkConfig {
}
func SetDefaultClusterCfg(cfg *ClusterSpec) Kubernetes {
cfg.Kubernetes.Nodelocaldns = true
if cfg.Kubernetes.Version == "" {
cfg.Kubernetes.Version = DefaultKubeVersion
} else {

4
docs/kubernetes-versions.md
View File

@ -22,6 +22,8 @@
| v1.19.9 | :white_check_mark: |
| v1.20.4 | :white_check_mark: |
| v1.20.6 | :white_check_mark: |
| v1.21.4 | :white_check_mark: |
| v1.22.1 | :white_check_mark: |
## Kubernetes Versions(arm64)
| Version | Supported |
@ -42,3 +44,5 @@
| v1.19.9 | :white_check_mark: |
| v1.20.4 | :white_check_mark: |
| v1.20.6 | :white_check_mark: |
| v1.21.4 | :white_check_mark: |
| v1.22.1 | :white_check_mark: |

1
pkg/util/executor/executor.go
View File

@ -91,6 +91,7 @@ func (executor *Executor) CreateManager() (*manager.Manager, error) {
mgr.ClientSet = executor.ClientSet
mgr.DownloadCommand = executor.DownloadCommand
mgr.EtcdContainer = false
// Description: Since docker is no the default container runtime of kubernetes, kubekey no longer uses docker to start etcd.
//if (executor.Cluster.Kubernetes.ContainerManager == "" || executor.Cluster.Kubernetes.ContainerManager == "docker") && executor.Cluster.Kubernetes.Type != "k3s" {
// mgr.EtcdContainer = true
//}