From 1f6ca66cb3e26fafd99ba7301824dbf897d545af Mon Sep 17 00:00:00 2001 From: zxyle Date: Sun, 13 Jun 2021 23:06:21 +0800 Subject: [PATCH] release k8s v1.21.1 --- README.md | 1 + README_en.md | 1 + images.properties | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index de8ea45..4ba4c0d 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ * 当前 master 分支已经在 Docker for Mac/Windows 3.1.0 (包含 Docker CE 20.10.3 和 Kubernetes 1.19.7) 版本测试通过 * 如果需要测试其他版本，请查看 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``` * 如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``` diff --git a/README_en.md b/README_en.md index 98e0f8d..1c75436 100644 --- a/README_en.md +++ b/README_en.md @@ -7,6 +7,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). * 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``` * 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``` diff --git a/images.properties b/images.properties index 52610ca..463ddc9 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.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.19.7 -k8s.gcr.io/kube-scheduler:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.19.7 -k8s.gcr.io/kube-proxy:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.19.7 -k8s.gcr.io/kube-apiserver:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.19.7 +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/etcd:3.4.13-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.13-0 -k8s.gcr.io/coredns:1.7.0=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.7.0 +k8s.gcr.io/coredns:1.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