diff --git a/README.md b/README.md index e9278a3..893e343 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,6 @@ 中文 | [English](README_en.md) - -欢迎体验阿里云容器服务 阿里云容器计算服务 ACS (Alibaba Cloud Container Compute Service,ACS), 开启云上Kubernetes实践之旅。https://www.aliyun.com/product/acs - - 说明: * 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) @@ -23,35 +19,14 @@ * 如Kubernetes版本为 v1.25.0, 请使用下面命令切换 [v1.25.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.25.0) ```git checkout v1.25.0``` * 如Kubernetes版本为 v1.24.2, 请使用下面命令切换 [v1.24.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.24.2) ```git checkout v1.24.2``` * 如Kubernetes版本为 v1.24.0, 请使用下面命令切换 [v1.24.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.24.0) ```git checkout v1.24.0``` - * 如Kubernetes版本为 v1.23.4, 请使用下面命令切换 [v1.23.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.23.4) ```git checkout v1.23.4``` - * 如Kubernetes版本为 v1.22.5, 请使用下面命令切换 [v1.22.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.5) ```git checkout v1.22.5``` - * 如Kubernetes版本为 v1.22.4, 请使用下面命令切换 [v1.22.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.4) ```git checkout v1.22.4``` - * 如Kubernetes版本为 v1.21.5, 请使用下面命令切换 [v1.21.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.5) ```git checkout v1.21.5``` - * 如Kubernetes版本为 v1.21.4, 请使用下面命令切换 [v1.21.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.4) ```git checkout v1.21.4``` - * 如Kubernetes版本为 v1.21.3, 请使用下面命令切换 [v1.21.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.3) ```git checkout v1.21.3``` - * 如Kubernetes版本为 v1.21.2, 请使用下面命令切换 [v1.21.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.2) ```git checkout v1.21.2``` - * 如Kubernetes版本为 v1.21.1, 请使用下面命令切换 [v1.21.1 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.1) ```git checkout v1.21.1``` - * 如Kubernetes版本为 v1.19.3, 请使用下面命令切换 [v1.19.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.19.3) ```git checkout v1.19.3``` - * 如Kubernetes版本为 v1.19.2, 请使用下面命令切换 [v1.19.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.19.2) ```git checkout v1.19.2``` - * 如Kubernetes版本为 v1.18.8, 请使用下面命令切换 [v1.18.8 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.8) ```git checkout v1.18.8``` - * 如Kubernetes版本为 v1.18.6, 请使用下面命令切换 [v1.18.6 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.6) ```git checkout v1.18.6``` - * 如Kubernetes版本为 v1.18.3, 请使用下面命令切换 [v1.18.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.3) ```git checkout v1.18.3``` - * 如Kubernetes版本为 v1.16.5, 请使用下面命令切换 [v1.16.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.16.5) ```git checkout v1.16.5``` - * 如Kubernetes版本为 v1.15.5, 请使用下面命令切换 [v1.15.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.15.5) ```git checkout v1.15.5``` - * 如Kubernetes版本为 v1.15.4, 请使用下面命令切换 [v1.15.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.15.4) ```git checkout v1.15.4``` - * 如Kubernetes版本为 v1.14.8, 请使用下面命令切换 [v1.14.8 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.8) ```git checkout v1.14.8``` - * 如Kubernetes版本为 v1.14.7, 请使用下面命令切换 [v1.14.7 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.7) ```git checkout v1.14.7``` - * 如Kubernetes版本为 v1.14.6, 请使用下面命令切换 [v1.14.6 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.6) ```git checkout v1.14.6``` - * 如Kubernetes版本为 v1.14.3, 请使用下面命令切换 [v1.14.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.3) ```git checkout v1.14.3``` - * 如Kubernetes版本为 v1.14.1, 请使用下面命令切换 [v1.14.1 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.1) ```git checkout v1.14.1``` - * 如Kubernetes版本为 v1.13.0, 请使用下面命令切换 [v1.13.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.13.0) ```git checkout v1.13.0``` - * 如Kubernetes版本为 v1.10.11, 请使用下面命令切换 [v1.10.11 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.10.11) ```git checkout v1.10.11``` - + 注: -* 如果发现K8s版本与您的环境不一致,可以修改```images.properties```文件指明所需镜像版本, -* 欢迎提交 Pull Request +* 如果发现K8s版本尚未提供,您可以修改```images.properties```文件指明所需镜像版本,并欢迎提交 Pull Request + * 通过如下命令可以获取指定K8s版本所需镜像 ```kubeadm config images list --kubernetes-version v1.30.2``` + * 可以访问 Docker Hub 获取所需如下镜像版本 tag [docker/desktop-kubernetes](https://hub.docker.com/r/docker/desktop-kubernetes/tags), [docker/desktop-vpnkit-controller](https://hub.docker.com/r/docker/desktop-vpnkit-controller/tags), [docker/desktop-storage-provisioner](https://hub.docker.com/r/docker/desktop-storage-provisioner/tags) 。 +* 欢迎体验阿里云容器服务 阿里云容器计算服务 ACS (Alibaba Cloud Container Compute Service,ACS), 开启云上Kubernetes实践之旅。https://www.aliyun.com/product/acs ### 开启 Kubernetes diff --git a/README_en.md b/README_en.md index d905f20..2fca663 100644 --- a/README_en.md +++ b/README_en.md @@ -17,30 +17,7 @@ NOTE: * For Kubernetes v1.25.2, please use the v1.25.2 branch ```git checkout v1.25.2``` * For Kubernetes v1.25.0, please use the v1.25.0 branch ```git checkout v1.25.0``` * For Kubernetes v1.24.2, please use the v1.24.2 branch ```git checkout v1.24.2``` - * For Kubernetes v1.24.0, please use the v1.24.0 branch ```git checkout v1.24.0``` - * For Kubernetes v1.23.4, please use the v1.23.4 branch ```git checkout v1.23.4``` - * For Kubernetes v1.22.5, please use the v1.22.5 branch ```git checkout v1.22.5``` - * For Kubernetes v1.22.4, please use the v1.22.4 branch ```git checkout v1.22.4``` - * For Kubernetes v1.21.4, please use the v1.21.1 branch ```git checkout v1.21.5``` - * For Kubernetes v1.21.4, please use the v1.21.1 branch ```git checkout v1.21.4``` - * For Kubernetes v1.21.3, please use the v1.21.1 branch ```git checkout v1.21.3``` - * For Kubernetes v1.21.2, please use the v1.21.1 branch ```git checkout v1.21.2``` - * For Kubernetes v1.21.1, please use the v1.21.1 branch ```git checkout v1.21.1``` - * For Kubernetes v1.19.3, please use the v1.19.3 branch ```git checkout v1.19.3``` - * For Kubernetes v1.19.2, please use the v1.19.2 branch ```git checkout v1.19.2``` - * For Kubernetes v1.18.8, please use the v1.18.8 branch ```git checkout v1.18.8``` - * For Kubernetes v1.18.6, please use the v1.18.6 branch ```git checkout v1.18.6``` - * For Kubernetes v1.18.3, please use the v1.18.3 branch ```git checkout v1.18.3``` - * For Kubernetes v1.16.5, please use the v1.16.5 branch ```git checkout v1.16.5``` - * For Kubernetes v1.15.5, please use the v1.15.5 branch ```git checkout v1.15.5``` - * For Kubernetes v1.15.4, please use the v1.15.4 branch ```git checkout v1.15.4``` - * For Kubernetes v1.14.8, please use the v1.14.8 branch ```git checkout v1.14.8``` - * For Kubernetes v1.14.7, please use the v1.14.7 branch ```git checkout v1.14.7``` - * For Kubernetes v1.14.6, please use the v1.14.6 branch ```git checkout v1.14.6``` - * For Kubernetes v1.14.3, please use the v1.14.3 branch ```git checkout v1.14.3``` - * For Kubernetes v1.14.1, please use the v1.14.1 branch ```git checkout v1.14.1``` - * For Kubernetes v1.13.0, please use the v1.13.0 branch ```git checkout v1.13.0``` - * For Kubernetes v1.10.11, please use the v1.10.11 branch ```git checkout v1.10.11``` + ### Enable Kubernetes on Docker Desktop