From 76b2be7ae9b8c18675c0a0226af528d7e596f3f2 Mon Sep 17 00:00:00 2001 From: Li Yi Date: Tue, 18 Aug 2020 08:46:31 +0800 Subject: [PATCH] Updated to v1.18.6 --- README.md | 3 ++- README_en.md | 3 ++- images.properties | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c320ad6..e25d0c6 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 2.3.2.0 Edge (包含 Docker CE 19.03.12 和 Kubernetes 1.18.3) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 2.3.4.0 Edge (包含 Docker CE 19.03.12 和 Kubernetes 1.18.6) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) + * 如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``` diff --git a/README_en.md b/README_en.md index 24c32f7..6e9ece3 100644 --- a/README_en.md +++ b/README_en.md @@ -4,9 +4,10 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 2.3.2.0 Edge (with Docker CE 19.03.12 and Kubernetes 1.18.3). +* The master branch is tested with Docker Desktop for Mac/Windows version 2.3.4.0 Edge (with Docker CE 19.03.12 and Kubernetes 1.18.6). * If you want to use with other version, pls check version of Kubernetes，Docker -> About Docker Desktop ![about](images/about.png) + * 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``` diff --git a/images.properties b/images.properties index f2886d0..3a1340e 100644 --- a/images.properties +++ b/images.properties @@ -1,8 +1,8 @@ k8s.gcr.io/pause:3.2=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.2 -k8s.gcr.io/kube-controller-manager:v1.18.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.18.3 -k8s.gcr.io/kube-scheduler:v1.18.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.18.3 -k8s.gcr.io/kube-proxy:v1.18.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.18.3 -k8s.gcr.io/kube-apiserver:v1.18.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.18.3 +k8s.gcr.io/kube-controller-manager:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.18.6 +k8s.gcr.io/kube-scheduler:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.18.6 +k8s.gcr.io/kube-proxy:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.18.6 +k8s.gcr.io/kube-apiserver:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.18.6 k8s.gcr.io/etcd:3.4.3-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.3-0 k8s.gcr.io/coredns:1.6.7=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.6.7 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1