From 5622e8758beaa6fa54ed6070d2a99082f2a671c0 Mon Sep 17 00:00:00 2001 From: LIC Date: Fri, 10 Sep 2021 16:40:40 +0800 Subject: [PATCH] add v1.22.1 --- README.md | 1 + README_en.md | 1 + images.properties | 14 +++++++------- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8f29250..b1108e1 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ * 当前 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.22.1 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.1) ```git checkout v1.22.1``` * 如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``` diff --git a/README_en.md b/README_en.md index a357a98..378e968 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 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.4, please use the v1.22.1 branch ```git checkout v1.22.1``` * 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 47fd700..38336c8 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.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 +k8s.gcr.io/pause:3.5=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.5 +k8s.gcr.io/kube-controller-manager:v1.22.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.22.1 +k8s.gcr.io/kube-scheduler:v1.22.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.22.1 +k8s.gcr.io/kube-proxy:v1.22.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.22.1 +k8s.gcr.io/kube-apiserver:v1.22.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.22.1 +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 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1