Support v1.25.0

v1.25.0
Li Yi 2 years ago
parent 913dc3333b
commit e72e15f63e

@ -4,10 +4,13 @@
说明: 说明:
* 近期从 k8s.gcr.io 拉取镜像的成功率高了很多,如果您通过如下命令 ```docker pull k8s.gcr.io/pause:3.8 ``` 测试镜像拉取成功,本项目相关部分可以直接跳过。
* 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) * 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community)
* 当前 master 分支已经在 Docker for Mac/Windows 4.8.0 (包含 Docker CE 20.10.14 和 Kubernetes 1.24.0) 版本测试通过 * 当前 master 分支已经在 Docker for Mac/Windows 4.12.0 (包含 Docker CE 20.10.17 和 Kubernetes 1.25.0) 版本测试通过
* 如果需要测试其他版本,请查看 Docker Desktop版本Docker -> About Docker Desktop * 如果需要测试其他版本,请查看 Docker Desktop版本Docker -> About Docker Desktop
![about](images/about.png) ![about](images/about.png)
* 如Kubernetes版本为 v1.25.0, 请使用下面命令切换 [v1.24.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.25.0) ```git checkout v1.25.0```
* 如Kubernetes版本为 v1.24.2, 请使用下面命令切换 [v1.24.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.24.2) ```git checkout v1.24.2```
* 如Kubernetes版本为 v1.24.0, 请使用下面命令切换 [v1.24.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.24.0) ```git checkout v1.24.0``` * 如Kubernetes版本为 v1.24.0, 请使用下面命令切换 [v1.24.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.24.0) ```git checkout v1.24.0```
* 如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.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.5, 请使用下面命令切换 [v1.22.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.5) ```git checkout v1.22.5``` * 如Kubernetes版本为 v1.22.5, 请使用下面命令切换 [v1.22.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.5) ```git checkout v1.22.5```

@ -7,6 +7,8 @@ NOTE:
* The master branch is tested with Docker Desktop for Mac/Windows version 4.8.0 (with Docker CE 20.10.14 and Kubernetes 1.24.0). * The master branch is tested with Docker Desktop for Mac/Windows version 4.8.0 (with Docker CE 20.10.14 and Kubernetes 1.24.0).
* If you want to use with other version, pls check version of KubernetesDocker -> About Docker Desktop * If you want to use with other version, pls check version of KubernetesDocker -> About Docker Desktop
![about](images/about.png) ![about](images/about.png)
* For Kubernetes v1.25.0, please use the v1.25.0 branch ```git checkout v1.25.0```
* For Kubernetes v1.24.2, please use the v1.24.2 branch ```git checkout v1.24.2```
* For Kubernetes v1.24.0, please use the v1.24.0 branch ```git checkout v1.24.0``` * For Kubernetes v1.24.0, please use the v1.24.0 branch ```git checkout v1.24.0```
* For Kubernetes v1.23.4, please use the v1.23.4 branch ```git checkout v1.23.4``` * For Kubernetes v1.23.4, please use the v1.23.4 branch ```git checkout v1.23.4```
* For Kubernetes v1.22.5, please use the v1.22.5 branch ```git checkout v1.22.5``` * For Kubernetes v1.22.5, please use the v1.22.5 branch ```git checkout v1.22.5```

@ -1,9 +1,9 @@
k8s.gcr.io/pause:3.7=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.7 k8s.gcr.io/pause:3.8=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.8
k8s.gcr.io/kube-controller-manager:v1.24.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.24.2 k8s.gcr.io/kube-controller-manager:v1.25.0=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.25.0
k8s.gcr.io/kube-scheduler:v1.24.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.24.2 k8s.gcr.io/kube-scheduler:v1.25.0=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.25.0
k8s.gcr.io/kube-proxy:v1.24.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.24.2 k8s.gcr.io/kube-proxy:v1.25.0=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.25.0
k8s.gcr.io/kube-apiserver:v1.24.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.24.2 k8s.gcr.io/kube-apiserver:v1.25.0=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.25.0
k8s.gcr.io/etcd:3.5.3-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.3-0 k8s.gcr.io/etcd:3.5.4-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.4-0
k8s.gcr.io/coredns/coredns:v1.8.6=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.8.6 k8s.gcr.io/coredns:v1.9.3=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.9.3
k8s.gcr.io/ingress-nginx/controller:v1.2.0=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:v1.2.0 k8s.gcr.io/ingress-nginx/controller:v1.2.0=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:v1.2.0
k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen:v1.1.1 k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen:v1.1.1

Loading…
Cancel
Save