From f88148b9d49e73787a34e3155701b903da37f0b2 Mon Sep 17 00:00:00 2001 From: Li Yi Date: Mon, 12 Jul 2021 10:18:01 +0800 Subject: [PATCH] Support v1.21.2 --- README.md | 2 +- README_en.md | 2 +- images.properties | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 98e353d..2ddd35d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 说明: * 需安装 Docker Desktop 的 Mac 或者 Windows 版本，如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) -* 当前 master 分支已经在 Docker for Mac/Windows 3.1.0 (包含 Docker CE 20.10.3 和 Kubernetes 1.19.7) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 3.5.2 (包含 Docker CE 20.10.7 和 Kubernetes 1.21.2) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) * 如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 e2d8808..9f830da 100644 --- a/README_en.md +++ b/README_en.md @@ -4,7 +4,7 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 3.1.0 (with Docker CE 20.10.3 and Kubernetes 1.19.7). +* The master branch is tested with Docker Desktop for Mac/Windows version 3.5.2 (with Docker CE 20.10.7 and Kubernetes 1.21.2). * 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.1``` diff --git a/images.properties b/images.properties index 6c3a18d..a8aaa63 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.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.21.1 -k8s.gcr.io/kube-scheduler:v1.21.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.21.1 -k8s.gcr.io/kube-proxy:v1.21.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.21.1 -k8s.gcr.io/kube-apiserver:v1.21.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.21.1 +k8s.gcr.io/kube-controller-manager:v1.21.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.21.2 +k8s.gcr.io/kube-scheduler:v1.21.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.21.2 +k8s.gcr.io/kube-proxy:v1.21.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.21.2 +k8s.gcr.io/kube-apiserver:v1.21.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.21.2 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