diff --git a/README.md b/README.md index 038b546..8f29250 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,10 @@ 说明: * 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) -* 当前 master 分支已经在 Docker for Mac/Windows 3.6.0 (包含 Docker CE 20.10.8 和 Kubernetes 1.21.3) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 4.0.0 (包含 Docker CE 20.10.8 和 Kubernetes 1.21.4) 版本测试通过 * 如果需要测试其他版本,请查看 Docker Desktop版本,Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.21.4, 请使用下面命令切换 [v1.21.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.3) ```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``` diff --git a/README_en.md b/README_en.md index 0398839..a357a98 100644 --- a/README_en.md +++ b/README_en.md @@ -4,11 +4,12 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 3.6.0 (with Docker CE 20.10.8 and Kubernetes 1.21.3). +* The master branch is tested with Docker Desktop for Mac/Windows version 4.0.0 (with Docker CE 20.10.8 and Kubernetes 1.21.4). * If you want to use with other version, pls check version of Kubernetes,Docker -> About Docker Desktop ![about](images/about.png) - * For Kubernetes v1.21.1, please use the v1.21.1 branch ```git checkout v1.21.3``` - * For Kubernetes v1.21.1, please use the v1.21.1 branch ```git checkout v1.21.2``` + * 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``` diff --git a/images.properties b/images.properties index 9066465..47fd700 100644 --- a/images.properties +++ b/images.properties @@ -1,8 +1,8 @@ k8s.gcr.io/pause:3.4.1=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.4.1 -k8s.gcr.io/kube-controller-manager:v1.21.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.21.3 -k8s.gcr.io/kube-scheduler:v1.21.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.21.3 -k8s.gcr.io/kube-proxy:v1.21.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.21.3 -k8s.gcr.io/kube-apiserver:v1.21.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.21.3 +k8s.gcr.io/kube-controller-manager:v1.21.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.21.4 +k8s.gcr.io/kube-scheduler:v1.21.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.21.4 +k8s.gcr.io/kube-proxy:v1.21.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.21.4 +k8s.gcr.io/kube-apiserver:v1.21.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.21.4 k8s.gcr.io/etcd:3.4.13-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.13-0 k8s.gcr.io/coredns/coredns:v1.8.0=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.8.0 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1