From 12f2659c49a1e70871016fb85f2d29ac462277f8 Mon Sep 17 00:00:00 2001 From: LIChao Date: Wed, 9 Mar 2022 17:51:51 +0800 Subject: [PATCH] add v1.23.4 --- README.md | 3 ++- README_en.md | 1 + images.properties | 14 +++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a61e80f..3cfa041 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.0.0 (包含 Docker CE 20.10.8 和 Kubernetes 1.21.4) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 4.0.0 (包含 Docker CE 20.10.8 和 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.1, 请使用下面命令切换 [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``` diff --git a/README_en.md b/README_en.md index 3162d1d..ef5a5eb 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.23.4, please use the v1.23.4 branch ```git checkout v1.23.4``` * For Kubernetes v1.22.1, 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``` diff --git a/images.properties b/images.properties index 38336c8..e407dbe 100644 --- a/images.properties +++ b/images.properties @@ -1,8 +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.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 +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