diff --git a/README.md b/README.md index 6f2a18a..b9fad04 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 4.4.2 (包含 Docker CE 20.10.12 和 Kubernetes 1.22.5) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 4.4.2 (包含 Docker CE 20.10.12 和 Kubernetes 1.23.4) 版本测试通过 * 如果需要测试其他版本,请查看 Docker Desktop版本,Docker -> About Docker Desktop ![about](images/about.png) + * 如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``` diff --git a/README_en.md b/README_en.md index d7cc847..7952ba8 100644 --- a/README_en.md +++ b/README_en.md @@ -7,9 +7,8 @@ NOTE: * The master branch is tested with Docker Desktop for Mac/Windows version 4.3.0 (with Docker CE 20.10.11 and Kubernetes 1.22.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.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``` diff --git a/images.properties b/images.properties index 5e46a38..3f3b3ba 100644 --- a/images.properties +++ b/images.properties @@ -1,9 +1,8 @@ -k8s.gcr.io/pause:3.5=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.5 -k8s.gcr.io/kube-controller-manager:v1.22.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.22.5 -k8s.gcr.io/kube-scheduler:v1.22.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.22.5 -k8s.gcr.io/kube-proxy:v1.22.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.22.5 -k8s.gcr.io/kube-apiserver:v1.22.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.22.5 -k8s.gcr.io/etcd:3.5.0-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.0-0 -k8s.gcr.io/coredns/coredns:v1.8.4=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.8.4 -k8s.gcr.io/ingress-nginx/controller:v1.1.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:v1.1.1 -k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen:v1.1.1 +k8s.gcr.io/pause:3.6=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.6 +k8s.gcr.io/kube-controller-manager:v1.23.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.23.4 +k8s.gcr.io/kube-scheduler:v1.23.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.23.4 +k8s.gcr.io/kube-proxy:v1.23.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.23.4 +k8s.gcr.io/kube-apiserver:v1.23.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.23.4 +k8s.gcr.io/etcd:3.5.1-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.1-0 +k8s.gcr.io/coredns/coredns:v1.8.6=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.8.6 +quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 \ No newline at end of file