msb_14154
/
k8s-for-docker-desktop
mirror of https://github.com/AliyunContainerService/k8s-for-docker-desktop
1
1
Code Issues Projects Releases Wiki Activity

Update for v1.18.8

Browse Source
v1.18.8
Li Yi 4 years ago
parent 76b2be7ae9
commit 828198fc3e
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File

7
README.md
Unescape View File

@ -5,9 +5,10 @@
说明: 说明:
* 需安装 Docker Desktop 的 Mac 或者 Windows 版本，如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) * 需安装 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 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop
![about](images/about.png) ![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.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.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``` * 如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``` * 如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 ### 开启 Kubernetes
@ -96,7 +97,7 @@ kubectl get nodes
#### 部署 Kubernetes dashboard #### 部署 Kubernetes dashboard
```shell ```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
``` ```
或 或

5
README_en.md
Unescape View File

@ -4,9 +4,10 @@
NOTE: 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 * If you want to use with other version, pls check version of Kubernetes，Docker -> About Docker Desktop
![about](images/about.png) ![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.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.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``` * 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 #### Install Kubernetes dashboard
```shell ```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 or

8
images.properties
Unescape View File

@ -1,8 +1,8 @@
k8s.gcr.io/pause:3.2=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.2 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-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.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.18.6 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.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.18.6 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.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.18.6 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/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/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 quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1

8
kubernetes-dashboard.yaml
Unescape View File

@ -187,7 +187,7 @@ spec:
spec: spec:
containers: containers:
- name: kubernetes-dashboard - name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-rc5 image: kubernetesui/dashboard:v2.0.4
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8443 - containerPort: 8443
@ -225,7 +225,7 @@ spec:
emptyDir: {} emptyDir: {}
serviceAccountName: kubernetes-dashboard serviceAccountName: kubernetes-dashboard
nodeSelector: nodeSelector:
"beta.kubernetes.io/os": linux "kubernetes.io/os": linux
# Comment the following tolerations if Dashboard must not be deployed on master # Comment the following tolerations if Dashboard must not be deployed on master
tolerations: tolerations:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
@ -271,7 +271,7 @@ spec:
spec: spec:
containers: containers:
- name: dashboard-metrics-scraper - name: dashboard-metrics-scraper
image: kubernetesui/metrics-scraper:v1.0.3 image: kubernetesui/metrics-scraper:v1.0.4
ports: ports:
- containerPort: 8000 - containerPort: 8000
protocol: TCP protocol: TCP
@ -292,7 +292,7 @@ spec:
runAsGroup: 2001 runAsGroup: 2001
serviceAccountName: kubernetes-dashboard serviceAccountName: kubernetes-dashboard
nodeSelector: nodeSelector:
"beta.kubernetes.io/os": linux "kubernetes.io/os": linux
# Comment the following tolerations if Dashboard must not be deployed on master # Comment the following tolerations if Dashboard must not be deployed on master
tolerations: tolerations:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master

Write Preview
Loading…
Cancel
Save