From da7b8dff0f931d44f3c1ebfaacc2659f75daa780 Mon Sep 17 00:00:00 2001 From: pixiake Date: Thu, 7 Nov 2024 16:57:28 +0800 Subject: [PATCH] Update 02-install-kubernetes-and-kubesphere.adoc --- .../02-install-kubernetes-and-kubesphere.adoc | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc index 597f9beb1..fd88a3131 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc @@ -189,7 +189,7 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-dow ---- -将 替换为实际需要的版本，例如 **v1.27.4**。{ks_product_right}默认支持 Kubernetes v1.21~1.28。 +将 替换为实际需要的版本，例如 **v1.28.12**。{ks_product_right}默认支持 Kubernetes v1.21~1.28。 命令执行完毕后将生成安装配置文件 **config-sample.yaml**。 @@ -218,29 +218,28 @@ spec: hosts: - {name: controlplane1, address: 192.168.0.2, internalAddress: 192.168.0.2, port: 23, user: ubuntu, password: Testing123, arch: arm64} # arm64 节点注意添加参数 arch: arm64 - {name: controlplane2, address: 192.168.0.3, internalAddress: 192.168.0.3, user: ubuntu, privateKeyPath: "~/.ssh/id_rsa"} - - {name: worker1, address: 192.168.0.4, internalAddress: 192.168.0.4, user: ubuntu, password: Testing123} - - {name: worker2, address: 192.168.0.5, internalAddress: 192.168.0.5, user: ubuntu, password: Testing123} - - {name: registry, address: 192.168.0.6, internalAddress: 192.168.0.6, user: ubuntu, password: Testing123} + - {name: controlplane3, address: 192.168.0.4, internalAddress: 192.168.0.4, port: 23, user: ubuntu, password: Testing123, arch: arm64} # arm64 节点注意添加参数 arch: arm64 + - {name: worker1, address: 192.168.0.5, internalAddress: 192.168.0.4, user: ubuntu, password: Testing123} + - {name: worker2, address: 192.168.0.6, internalAddress: 192.168.0.5, user: ubuntu, password: Testing123} roleGroups: etcd: - controlplane1 - controlplane2 + - controlplane3 control-plane: - controlplane1 - controlplane2 + - controlplane3 worker: - worker1 - worker2 - # 如需使用 kk 自动部署镜像仓库，请设置 registry（建议镜像仓库与集群节点分离部署，减少相互影响） - registry: - - registry controlPlaneEndpoint: internalLoadbalancer: haproxy # 如需部署⾼可⽤集群，且⽆负载均衡器可⽤，可开启该参数，做集群内部负载均衡 domain: lb.kubesphere.local address: "" port: 6443 kubernetes: - version: v1.23.15 + version: v1.28.12 clusterName: cluster.local network: plugin: calico @@ -249,16 +248,7 @@ spec: ## multus support. https://github.com/k8snetworkplumbingwg/multus-cni enableMultusCNI: false registry: - # 如需使用 kk 部署 harbor，可将该参数设置为 harbor，不设置该参数且需使用 kk 部署容器镜像仓库，将默认部署 docker registry。 - # harbor 不支持 arm64，arm64 环境部署时，可不配置该参数。 - type: harbor - # 如使用 kk 部署的 harbor 或其他需要登录的仓库，需设置对应仓库的 auths，如使用 kk 部署默认的 docker registry 仓库，则无需配置 auths 参数。 - auths: - "dockerhub.kubekey.local": - username: admin # harbor 默认用户名 - password: Harbor12345 # harbor 默认密码 - plainHTTP: false  # 如果仓库使用 http，请将该参数设置为 true - privateRegistry: "dockerhub.kubekey.local/kse"   # 设置集群部署时使用的私有仓库地址 + privateRegistry: "" registryMirrors: [] insecureRegistries: [] addons: []