diff --git a/README.md b/README.md index 6f16841..dbab5b5 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,10 @@ https://free.aliyun.com/?product=9596839 说明: * 需安装 Docker Desktop 的 Mac 或者 Windows 版本,如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) -* 当前 master 分支已经在 Docker for Mac/Windows 4.30.0 (包含 Docker 26.1.1 和 Kubernetes v1.29.2) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 4.33.0 (包含 Docker 27.1.1 和 Kubernetes v1.30.2) 版本测试通过 * 如果需要测试其他版本,请查看 Docker Desktop版本,Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.30.2, 请使用下面命令切换 [v1.30.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.30.2) ```git checkout v1.30.2``` * 如Kubernetes版本为 v1.29.2, 请使用下面命令切换 [v1.29.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.29.2) ```git checkout v1.29.2``` * 如Kubernetes版本为 v1.29.1, 请使用下面命令切换 [v1.29.1 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.29.1) ```git checkout v1.29.1``` * 如Kubernetes版本为 v1.28.2, 请使用下面命令切换 [v1.28.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.28.2) ```git checkout v1.28.2``` diff --git a/README_en.md b/README_en.md index 77e2d50..d905f20 100644 --- a/README_en.md +++ b/README_en.md @@ -4,9 +4,10 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 4.27.0 (with Docker 25.0.1 and Kubernetes v1.29.1). +* The master branch is tested with Docker Desktop for Mac/Windows version 4.33.0 (with Docker 27.1.1 and Kubernetes v1.30.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.30.2, please use the v1.30.2 branch ```git checkout v1.30.2``` * For Kubernetes v1.29.2, please use the v1.29.2 branch ```git checkout v1.29.2``` * For Kubernetes v1.29.1, please use the v1.29.1 branch ```git checkout v1.29.1``` * For Kubernetes v1.28.2, please use the v1.28.2 branch ```git checkout v1.28.2``` diff --git a/images.properties b/images.properties index 9c956fe..ea54e89 100644 --- a/images.properties +++ b/images.properties @@ -1,7 +1,10 @@ registry.k8s.io/pause:3.9=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.9 -registry.k8s.io/kube-controller-manager:v1.29.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.29.2 -registry.k8s.io/kube-scheduler:v1.29.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.29.2 -registry.k8s.io/kube-proxy:v1.29.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.29.2 -registry.k8s.io/kube-apiserver:v1.29.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.29.2 -registry.k8s.io/etcd:3.5.10-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.10-0 +registry.k8s.io/kube-controller-manager:v1.30.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.30.2 +registry.k8s.io/kube-scheduler:v1.30.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.30.2 +registry.k8s.io/kube-proxy:v1.30.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.30.2 +registry.k8s.io/kube-apiserver:v1.30.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.30.2 +registry.k8s.io/etcd:3.5.12-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.12-0 registry.k8s.io/coredns/coredns:v1.11.1=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.11.1 +docker/desktop-kubernetes:kubernetes-v1.30.2-cni-v1.4.0-critools-v1.29.0-cri-dockerd-v0.3.11-1-debian=registry.cn-hangzhou.aliyuncs.com/docker-containers/desktop-kubernetes:kubernetes-v1.30.2-cni-v1.4.0-critools-v1.29.0-cri-dockerd-v0.3.11-1-debian +docker/desktop-vpnkit-controller:dc331cb22850be0cdd97c84a9cfecaf44a1afb6e=registry.cn-hangzhou.aliyuncs.com/docker-containers/desktop-vpnkit-controller:dc331cb22850be0cdd97c84a9cfecaf44a1afb6e +docker/desktop-storage-provisioner:v2.0=registry.cn-hangzhou.aliyuncs.com/docker-containers/desktop-storage-provisioner:v2.0 \ No newline at end of file