diff --git a/README.md b/README.md index e25d0c6..006d70c 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.4.0 Edge (包含 Docker CE 19.03.12 和 Kubernetes 1.18.6) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 2.3.6.0 Edge (包含 Docker CE 19.03.13 和 Kubernetes 1.18.8) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) + * 如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``` * 如Kubernetes版本为 v1.15.5, 请使用下面命令切换 [v1.15.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.15.5) ```git checkout v1.15.5``` @@ -21,7 +22,7 @@ * 如Kubernetes版本为 v1.10.11, 请使用下面命令切换 [v1.10.11 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.10.11) ```git checkout v1.10.11``` - +注：如果发现K8s版本与您的环境不一致，可以修改```images.properties```文件指明所需镜像版本，欢迎Pull Request。 ### 开启 Kubernetes @@ -96,7 +97,7 @@ kubectl get nodes #### 部署 Kubernetes dashboard ```shell -kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc5/aio/deploy/recommended.yaml +$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.4/aio/deploy/recommended.yaml ``` 或 diff --git a/README_en.md b/README_en.md index 6e9ece3..ffa9d57 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.4.0 Edge (with Docker CE 19.03.12 and Kubernetes 1.18.6). +* 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). * 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.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``` * For Kubernetes v1.15.5, please use the v1.15.5 branch ```git checkout v1.15.5``` @@ -75,7 +76,7 @@ kubectl get nodes #### Install Kubernetes dashboard ```shell -kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc5/aio/deploy/recommended.yaml +$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.4/aio/deploy/recommended.yaml ``` or diff --git a/images.properties b/images.properties index 3a1340e..6c7de8d 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.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.18.6 -k8s.gcr.io/kube-scheduler:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.18.6 -k8s.gcr.io/kube-proxy:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.18.6 -k8s.gcr.io/kube-apiserver:v1.18.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.18.6 +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 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 diff --git a/kubernetes-dashboard.yaml b/kubernetes-dashboard.yaml index 742f616..217383d 100644 --- a/kubernetes-dashboard.yaml +++ b/kubernetes-dashboard.yaml @@ -187,7 +187,7 @@ spec: spec: containers: - name: kubernetes-dashboard - image: kubernetesui/dashboard:v2.0.0-rc5 + image: kubernetesui/dashboard:v2.0.4 imagePullPolicy: Always ports: - containerPort: 8443 @@ -225,7 +225,7 @@ spec: emptyDir: {} serviceAccountName: kubernetes-dashboard nodeSelector: - "beta.kubernetes.io/os": linux + "kubernetes.io/os": linux # Comment the following tolerations if Dashboard must not be deployed on master tolerations: - key: node-role.kubernetes.io/master @@ -271,7 +271,7 @@ spec: spec: containers: - name: dashboard-metrics-scraper - image: kubernetesui/metrics-scraper:v1.0.3 + image: kubernetesui/metrics-scraper:v1.0.4 ports: - containerPort: 8000 protocol: TCP @@ -292,7 +292,7 @@ spec: runAsGroup: 2001 serviceAccountName: kubernetes-dashboard nodeSelector: - "beta.kubernetes.io/os": linux + "kubernetes.io/os": linux # Comment the following tolerations if Dashboard must not be deployed on master tolerations: - key: node-role.kubernetes.io/master