From 8fd6aae654679c2876272ce30840435eee3ee8bc Mon Sep 17 00:00:00 2001 From: Chen Su Date: Wed, 4 Nov 2020 09:49:22 +0800 Subject: [PATCH 01/10] Docker desktop 2.5.0.0 (Kubernetes v1.19.3) --- images.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/images.properties b/images.properties index 6c7de8d..39d40f1 100644 --- a/images.properties +++ b/images.properties @@ -1,8 +1,8 @@ -k8s.gcr.io/pause:3.2=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.2 -k8s.gcr.io/kube-controller-manager:v1.18.8=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.18.8 -k8s.gcr.io/kube-scheduler:v1.18.8=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.18.8 -k8s.gcr.io/kube-proxy:v1.18.8=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.18.8 -k8s.gcr.io/kube-apiserver:v1.18.8=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.18.8 -k8s.gcr.io/etcd:3.4.3-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.3-0 -k8s.gcr.io/coredns:1.6.7=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.6.7 +k8s.gcr.io/pause:3.1=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.1 +k8s.gcr.io/kube-controller-manager:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.19.3 +k8s.gcr.io/kube-scheduler:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.19.3 +k8s.gcr.io/kube-proxy:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.19.3 +k8s.gcr.io/kube-apiserver:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.19.3 +k8s.gcr.io/etcd:3.3.15-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.3.15-0 +k8s.gcr.io/coredns:1.6.2=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.6.2 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 From b4f7d33f9fcbddba52419478c447686fefdc9ab8 Mon Sep 17 00:00:00 2001 From: tanchao Date: Wed, 4 Nov 2020 11:28:08 +0800 Subject: [PATCH 02/10] =?UTF-8?q?pause=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E5=BA=94=E4=B8=BA3.2=EF=BC=9Betcd=E5=BA=94=E4=B8=BA3.4.13-0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images.properties b/images.properties index 39d40f1..8b1f53f 100644 --- a/images.properties +++ b/images.properties @@ -1,8 +1,8 @@ -k8s.gcr.io/pause:3.1=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.1 +k8s.gcr.io/pause:3.2=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.2 k8s.gcr.io/kube-controller-manager:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.19.3 k8s.gcr.io/kube-scheduler:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.19.3 k8s.gcr.io/kube-proxy:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.19.3 k8s.gcr.io/kube-apiserver:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.19.3 -k8s.gcr.io/etcd:3.3.15-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.3.15-0 +k8s.gcr.io/etcd:3.4.13-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.13-0 k8s.gcr.io/coredns:1.6.2=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.6.2 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 From ca3ae06f4a1591fa33173bcb3f679967806c0850 Mon Sep 17 00:00:00 2001 From: zhusaidong <635925926@qq.com> Date: Thu, 5 Nov 2020 10:53:54 +0800 Subject: [PATCH 03/10] Update images.properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit k8s:v1.19.3，使用的是coredns:1.7.0 --- images.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.properties b/images.properties index 8b1f53f..25c1f59 100644 --- a/images.properties +++ b/images.properties @@ -4,5 +4,5 @@ k8s.gcr.io/kube-scheduler:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_conta k8s.gcr.io/kube-proxy:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.19.3 k8s.gcr.io/kube-apiserver:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.19.3 k8s.gcr.io/etcd:3.4.13-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.13-0 -k8s.gcr.io/coredns:1.6.2=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.6.2 +k8s.gcr.io/coredns:1.7.0=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.7.0 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 From 28caeb743b4f1e7b0c70ce24469a7d735de81efc Mon Sep 17 00:00:00 2001 From: Li Yi Date: Thu, 5 Nov 2020 17:16:28 +0800 Subject: [PATCH 04/10] Update README.md --- README.md | 3 ++- README_en.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 006d70c..7be6a5d 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 2.3.6.0 Edge (包含 Docker CE 19.03.13 和 Kubernetes 1.18.8) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 2.5.0.0 (包含 Docker CE 20.10.0 和 Kubernetes 1.19.3) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.18.8, 请使用下面命令切换 [v1.18.8 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.8) ```git checkout v1.18.8``` * 如Kubernetes版本为 v1.18.6, 请使用下面命令切换 [v1.18.6 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.6) ```git checkout v1.18.6``` * 如Kubernetes版本为 v1.18.3, 请使用下面命令切换 [v1.18.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.3) ```git checkout v1.18.3``` * 如Kubernetes版本为 v1.16.5, 请使用下面命令切换 [v1.16.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.16.5) ```git checkout v1.16.5``` diff --git a/README_en.md b/README_en.md index ffa9d57..8a3162d 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 2.3.6.0 Edge (with Docker CE 19.03.13 and Kubernetes 1.18.8). +* The master branch is tested with Docker Desktop for Mac/Windows version 2.5.0.0 Edge (with Docker CE 20.10.0 and Kubernetes 1.19.3). * If you want to use with other version, pls check version of Kubernetes，Docker -> About Docker Desktop ![about](images/about.png) + * For Kubernetes v1.18.8, please use the v1.18.8 branch ```git checkout v1.18.8``` * For Kubernetes v1.18.6, please use the v1.18.6 branch ```git checkout v1.18.6``` * For Kubernetes v1.18.3, please use the v1.18.3 branch ```git checkout v1.18.3``` * For Kubernetes v1.16.5, please use the v1.16.5 branch ```git checkout v1.16.5``` From 341b0408ed52e7c4435bc341656a6b8a2cf99e9e Mon Sep 17 00:00:00 2001 From: Li Yi Date: Sun, 21 Feb 2021 16:34:05 +0800 Subject: [PATCH 05/10] Support v1.19.7 testing with M1 --- README.md | 4 +++- README_en.md | 4 +++- images.properties | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7be6a5d..de8ea45 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,11 @@ 说明: * 需安装 Docker Desktop 的 Mac 或者 Windows 版本，如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) -* 当前 master 分支已经在 Docker for Mac/Windows 2.5.0.0 (包含 Docker CE 20.10.0 和 Kubernetes 1.19.3) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 3.1.0 (包含 Docker CE 20.10.3 和 Kubernetes 1.19.7) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.19.3, 请使用下面命令切换 [v1.19.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.19.3) ```git checkout v1.19.3``` + * 如Kubernetes版本为 v1.19.2, 请使用下面命令切换 [v1.19.2 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.19.2) ```git checkout v1.19.2``` * 如Kubernetes版本为 v1.18.8, 请使用下面命令切换 [v1.18.8 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.8) ```git checkout v1.18.8``` * 如Kubernetes版本为 v1.18.6, 请使用下面命令切换 [v1.18.6 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.6) ```git checkout v1.18.6``` * 如Kubernetes版本为 v1.18.3, 请使用下面命令切换 [v1.18.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.18.3) ```git checkout v1.18.3``` diff --git a/README_en.md b/README_en.md index 8a3162d..98e0f8d 100644 --- a/README_en.md +++ b/README_en.md @@ -4,9 +4,11 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 2.5.0.0 Edge (with Docker CE 20.10.0 and Kubernetes 1.19.3). +* The master branch is tested with Docker Desktop for Mac/Windows version 3.1.0 (with Docker CE 20.10.3 and Kubernetes 1.19.7). * If you want to use with other version, pls check version of Kubernetes，Docker -> About Docker Desktop ![about](images/about.png) + * For Kubernetes v1.19.3, please use the v1.19.3 branch ```git checkout v1.19.3``` + * For Kubernetes v1.19.2, please use the v1.19.2 branch ```git checkout v1.19.2``` * For Kubernetes v1.18.8, please use the v1.18.8 branch ```git checkout v1.18.8``` * For Kubernetes v1.18.6, please use the v1.18.6 branch ```git checkout v1.18.6``` * For Kubernetes v1.18.3, please use the v1.18.3 branch ```git checkout v1.18.3``` diff --git a/images.properties b/images.properties index 25c1f59..52610ca 100644 --- a/images.properties +++ b/images.properties @@ -1,8 +1,8 @@ k8s.gcr.io/pause:3.2=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.2 -k8s.gcr.io/kube-controller-manager:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.19.3 -k8s.gcr.io/kube-scheduler:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.19.3 -k8s.gcr.io/kube-proxy:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.19.3 -k8s.gcr.io/kube-apiserver:v1.19.3=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.19.3 +k8s.gcr.io/kube-controller-manager:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.19.7 +k8s.gcr.io/kube-scheduler:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.19.7 +k8s.gcr.io/kube-proxy:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.19.7 +k8s.gcr.io/kube-apiserver:v1.19.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.19.7 k8s.gcr.io/etcd:3.4.13-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.13-0 k8s.gcr.io/coredns:1.7.0=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.7.0 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 From d2e30e643f37a44af9329637724c86555b5d5ca3 Mon Sep 17 00:00:00 2001 From: Li Yi Date: Sun, 28 Mar 2021 15:01:06 +0800 Subject: [PATCH 06/10] Refine the problem determination --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index de8ea45..5eb660d 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,16 @@ pred='process matches ".*(ocker|vpnkit).*" 在Windows上: 如果在Kubernetes部署的过程中出现问题，可以在 C:\ProgramData\DockerDesktop下的service.txt 查看Docker日志; -如果看到 Kubernetes一直在启动状态，请参考 [Issue 3769(comment)](https://github.com/docker/for-win/issues/3769#issuecomment-486046718) 和 [Issue 1962(comment)](https://github.com/docker/for-win/issues/1962#issuecomment-431091114) + + +**问题诊断**： + +如果看到 Kubernetes一直在启动状态，请参考 + +* [Issue 3769(comment)](https://github.com/docker/for-win/issues/3769#issuecomment-486046718) 或 [Issue 3649(comment)](https://github.com/docker/for-mac/issues/3649#issuecomment-497441158) + * 在macOS上面，执行 ```rm -fr '~/Library/Group\ Containers/group.com.docker/pki'``` + * 在Windows上面删除 'C:\ProgramData\DockerDesktop\pki' 目录 +* [Issue 1962(comment)](https://github.com/docker/for-win/issues/1962#issuecomment-431091114) ### 配置 Kubernetes From fdba7c375d457a2095888b7aee86ae6fbdee7e57 Mon Sep 17 00:00:00 2001 From: mazyi <6824119+mazyi@users.noreply.github.com> Date: Sat, 3 Apr 2021 00:52:20 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=ADpki=E6=96=87=E4=BB=B6=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=20=E5=92=8C=20Kubernetes=E6=97=A5=E5=BF=97=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5eb660d..55afd8e 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ pred='process matches ".*(ocker|vpnkit).*" 在Windows上: -如果在Kubernetes部署的过程中出现问题，可以在 C:\ProgramData\DockerDesktop下的service.txt 查看Docker日志; +如果在Kubernetes部署的过程中出现问题，可以在 C:\ProgramData\DockerDesktop下的service.txt 查看Docker日志, 在 C:\Users\yourUserName\AppData\Local\Docker下的log.txt 查看Kubernetes日志; **问题诊断**： @@ -84,7 +84,7 @@ pred='process matches ".*(ocker|vpnkit).*" * [Issue 3769(comment)](https://github.com/docker/for-win/issues/3769#issuecomment-486046718) 或 [Issue 3649(comment)](https://github.com/docker/for-mac/issues/3649#issuecomment-497441158) * 在macOS上面，执行 ```rm -fr '~/Library/Group\ Containers/group.com.docker/pki'``` - * 在Windows上面删除 'C:\ProgramData\DockerDesktop\pki' 目录 + * 在Windows上面删除 'C:\ProgramData\DockerDesktop\pki' 目录 和 'C:\Users\yourUserName\AppData\Local\Docker\pki' 目录 * [Issue 1962(comment)](https://github.com/docker/for-win/issues/1962#issuecomment-431091114) ### 配置 Kubernetes From 995a99d19ba3c8136cc736702447df9715870185 Mon Sep 17 00:00:00 2001 From: mazyi <6824119+mazyi@users.noreply.github.com> Date: Sat, 3 Apr 2021 00:59:44 +0800 Subject: [PATCH 08/10] add tips and problem diagnosis in English README --- README_en.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README_en.md b/README_en.md index 98e0f8d..0a61444 100644 --- a/README_en.md +++ b/README_en.md @@ -55,6 +55,31 @@ Enable Kubernetes, and wait a while for Kubernetes is running ![k8s](images/k8s.png) +**TIPS**： + +On Mac: + +If facing problems when deploy Kubernetes, you can check ocker desktop application's log to get realtime log： + +```bash +pred='process matches ".*(ocker|vpnkit).*" + || (process in {"taskgated-helper", "launchservicesd", "kernel"} && eventMessage contains[c] "docker")' +/usr/bin/log stream --style syslog --level=debug --color=always --predicate "$pred" +``` + +On Windows: + +If facing problems when deploy Kubernetes, you can check docker log in C:\ProgramData\DockerDesktop\service.txt, check Kuberneteslog in C:\Users\yourUserName\AppData\Local\Docker\log.txt + + +**problem diagnosis**： + +If you see Kubernetes stuck in Starting, please refer: + +* [Issue 3769(comment)](https://github.com/docker/for-win/issues/3769#issuecomment-486046718) or [Issue 3649(comment)](https://github.com/docker/for-mac/issues/3649#issuecomment-497441158) + * On MacOS, execute ```rm -fr '~/Library/Group\ Containers/group.com.docker/pki'``` + * On Windows, delete folders 'C:\ProgramData\DockerDesktop\pki' and 'C:\Users\yourUserName\AppData\Local\Docker\pki' +* [Issue 1962(comment)](https://github.com/docker/for-win/issues/1962#issuecomment-431091114) ### Config Kubernetes From 89a52420ccd605d439deb52ac625ad38cffc28bd Mon Sep 17 00:00:00 2001 From: mazyi <6824119+mazyi@users.noreply.github.com> Date: Sat, 3 Apr 2021 01:00:29 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=A5=E5=B0=BE?= =?UTF-8?q?=E5=88=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55afd8e..ea45fae 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ pred='process matches ".*(ocker|vpnkit).*" 在Windows上: -如果在Kubernetes部署的过程中出现问题，可以在 C:\ProgramData\DockerDesktop下的service.txt 查看Docker日志, 在 C:\Users\yourUserName\AppData\Local\Docker下的log.txt 查看Kubernetes日志; +如果在Kubernetes部署的过程中出现问题，可以在 C:\ProgramData\DockerDesktop下的service.txt 查看Docker日志, 在 C:\Users\yourUserName\AppData\Local\Docker下的log.txt 查看Kubernetes日志 **问题诊断**： From aae1df037c3ccd6bdfa93948ab4be9aae8e1b283 Mon Sep 17 00:00:00 2001 From: Cyberhan123 <38837039+Cyberhan123@users.noreply.github.com> Date: Mon, 26 Apr 2021 09:40:20 +0800 Subject: [PATCH 10/10] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:g更新helm的中文安装描述 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ea45fae..118c832 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ kubectl delete -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/con ### 安装 Helm 可以根据文档安装 helm v3 https://helm.sh/docs/intro/install/ +在国内由于helm的cdn节点使用的是谷歌云所以可能访问不到，可以参考已存在的官方issue： https://github.com/helm/helm/issues/7028 #### 在 Mac OS 上安装