diff --git a/README.md b/README.md index d8861b8..730c4ce 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,20 @@ 中文 | [English](README_en.md) + +欢迎体验阿里云容器服务 Kubernetes Serverless版 (ASK)免费试用计划 +, 开启云上云原生实践之旅。 +https://free.aliyun.com/?product=9596839 + 说明: * 近期从 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) -* 当前 master 分支已经在 Docker for Mac/Windows 4.13.1 (包含 Docker CE 20.10.20 和 Kubernetes 1.25.9) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 4.24.1 (包含 Docker CE 24.0.2 和 Kubernetes 1.27.2) 版本测试通过 * 如果需要测试其他版本,请查看 Docker Desktop版本,Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.27.2, 请使用下面命令切换 [v1.27.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.27.2) ```git checkout v1.27.2``` + * 如Kubernetes版本为 v1.25.9, 请使用下面命令切换 [v1.25.9 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.25.9) ```git checkout v1.25.9``` * 如Kubernetes版本为 v1.25.4, 请使用下面命令切换 [v1.25.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.25.4) ```git checkout v1.25.4``` * 如Kubernetes版本为 v1.25.2, 请使用下面命令切换 [v1.25.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.25.2) ```git checkout v1.25.2``` * 如Kubernetes版本为 v1.25.0, 请使用下面命令切换 [v1.25.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.25.0) ```git checkout v1.25.0``` diff --git a/README_en.md b/README_en.md index a38dd0a..874182e 100644 --- a/README_en.md +++ b/README_en.md @@ -4,10 +4,11 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 4.13.1 (with Docker CE 20.10.20 and Kubernetes 1.25.9). +* The master branch is tested with Docker Desktop for Mac/Windows version 4.21.1 (with Docker CE 24.0.2 and Kubernetes 1.27.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.25.4, please use the v1.25.9 branch ```git checkout v1.25.9``` + * For Kubernetes v1.27.2, please use the v1.27.2 branch ```git checkout v1.27.2``` + * For Kubernetes v1.25.9, please use the v1.25.9 branch ```git checkout v1.25.9``` * For Kubernetes v1.25.4, please use the v1.25.4 branch ```git checkout v1.25.4``` * For Kubernetes v1.25.2, please use the v1.25.2 branch ```git checkout v1.25.2``` * For Kubernetes v1.25.0, please use the v1.25.0 branch ```git checkout v1.25.0``` diff --git a/images.properties b/images.properties index 59e9dbe..d264028 100644 --- a/images.properties +++ b/images.properties @@ -1,9 +1,9 @@ -registry.k8s.io/pause:3.8=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.8 -registry.k8s.io/kube-controller-manager:v1.25.9=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.25.9 -registry.k8s.io/kube-scheduler:v1.25.9=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.25.9 -registry.k8s.io/kube-proxy:v1.25.9=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.25.9 -registry.k8s.io/kube-apiserver:v1.25.9=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.25.9 -registry.k8s.io/etcd:3.5.5-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.5-0 -registry.k8s.io/coredns/coredns:v1.9.3=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.9.3 +registry.k8s.io/pause:3.9=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.9 +registry.k8s.io/kube-controller-manager:v1.27.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.27.2 +registry.k8s.io/kube-scheduler:v1.27.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.27.2 +registry.k8s.io/kube-proxy:v1.27.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.27.2 +registry.k8s.io/kube-apiserver:v1.27.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.27.2 +registry.k8s.io/etcd:3.5.7-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.7-0 +registry.k8s.io/coredns/coredns:v1.10.1=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.10.1 registry.k8s.io/ingress-nginx/controller:v1.6.4=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:v1.6.4 registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.2=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen:v1.5.2