diff --git a/README.md b/README.md index eff8055..a69c35d 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,18 @@ 中文 | [English](README_en.md) + 说明: -* 需安装 Docker Desktop 的 Mac 或者 Windows 版本，如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) -* 当前 master 分支已经在 Docker for Mac/Windows 4.33.0 (包含 Docker 27.1.1 和 Kubernetes v1.30.2) 版本测试通过 + * **注意** 请阅读并遵守 [docker subscription service agreement](https://www.docker.com/legal/docker-subscription-service-agreement/) , 如果不接受 Docker Desktop 的使用条款，建议使用 [Minikube](https://minikube.sigs.k8s.io/docs/) 等其他开源工具。 + + + +* 需安装 Docker Desktop 的 Mac 或者 Windows 版本 +* 当前 master 分支已经在 Docker for Mac/Windows 4.37.0 (包含 Docker 27.4.0 和 Kubernetes v1.30.5) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.30.5, 请使用下面命令切换 [v1.30.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.30.5) ```git checkout v1.30.5``` * 如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``` diff --git a/README_en.md b/README_en.md index 01a6b2c..7250b6d 100644 --- a/README_en.md +++ b/README_en.md @@ -3,10 +3,11 @@ [中文](README.md) | English NOTE: - -* 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). +* Please read and follow [docker subscription service agreement](https://www.docker.com/legal/docker-subscription-service-agreement/), If you don't accept that please select other opensource project, e.g. [Minikube](https://minikube.sigs.k8s.io/docs/) . +* The master branch is tested with Docker Desktop for Mac/Windows version 4.37.0 (with Docker 27.4.0 and Kubernetes v1.30.5). * 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.5, please use the v1.30.5 branch ```git checkout v1.30.5``` * 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``` diff --git a/images.properties b/images.properties index ea54e89..b758df3 100644 --- a/images.properties +++ b/images.properties @@ -1,10 +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.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/kube-controller-manager:v1.30.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.30.5 +registry.k8s.io/kube-scheduler:v1.30.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.30.5 +registry.k8s.io/kube-proxy:v1.30.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.30.5 +registry.k8s.io/kube-apiserver:v1.30.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.30.5 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 +registry.k8s.io/coredns/coredns:v1.11.3=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.11.3 +docker/desktop-kubernetes:kubernetes-v1.30.5-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.5-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 +docker/desktop-storage-provisioner:v2.0=registry.cn-hangzhou.aliyuncs.com/docker-containers/desktop-storage-provisioner:v2.0