From 27c90426bdb1d1d90bd99002db2263465b5318e1 Mon Sep 17 00:00:00 2001 From: Li Yi Date: Wed, 16 Oct 2019 14:54:13 +0800 Subject: [PATCH 1/3] Update to Docker Desktop 2.1.4.0, Ingress 0.26.1 and Istio 1.3.3 --- README.md | 13 +++++++------ README_en.md | 11 ++++++----- images.properties | 11 +++++------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index afa30fb..15b36c1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ 说明: * 需安装 Docker Desktop 的 Mac 或者 Windows 版本，如果没有请下载[下载 Docker CE最新版本](https://store.docker.com/search?type=edition&offering=community) -* 当前 master 分支已经在 Docker for Mac/Windows 2.1.2.x (包含 Docker CE 19.03.2 和 Kubernetes 1.14.6) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 2.1.4.x (包含 Docker CE 19.03.3 和 Kubernetes 1.15.4) 版本测试通过 + * 如果你希望使用 Docker for Mac/Windows 2.1.3.x (包含 Docker CE 19.03.2 和 Kubernetes 1.14.6) , 请使用下面命令切换 [v1.14.6 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.6) ```git checkout v1.14.6``` * 如果你希望使用 Docker for Mac/Windows 2.1.1.x (包含 Docker CE 19.03.0 和 Kubernetes 1.14.3) , 请使用下面命令切换 [v1.14.3 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.3) ```git checkout v1.14.3``` * 如果你希望使用 Docker for Mac/Windows 2.0.4.x (包含 Docker CE 18.09.1 和 Kubernetes 1.14.1) , 请使用下面命令切换 [v1.14.1 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.14.1) ```git checkout v1.14.1``` * 如果你希望使用 Docker for Mac/Windows 2.0.1.x/2.0.2.x/2.0.3.x (包含 Docker CE 18.09.1 和 Kubernetes 1.13.0) , 请使用下面命令切换 [v2.0.1.0 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v2.0.1.0) ```git checkout v2.0.1.0``` @@ -228,7 +229,7 @@ Error: incompatible versions client[v2.13.1] server[v2.12.2] brew install kubernetes-helm # Install Tiller into your Kubernetes cluster -helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.1 --skip-refresh +helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.3 --skip-refresh # Change helm repo helm repo add stable http://mirror.azure.cn/kubernetes/charts-incubator/ @@ -241,7 +242,7 @@ helm repo update ``` # Download binary release -在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-darwin-amd64.tar.gz +在 https://github.com/helm/helm/releases 中找到匹配的版本并下载(需要梯子), 如: https://storage.googleapis.com/kubernetes-helm/helm-v2.14.3-darwin-amd64.tar.gz # Unpack @@ -279,11 +280,11 @@ helm repo update 可以根据文档安装 Istio https://istio.io/docs/setup/kubernetes/ -#### 下载 Istio 1.2.4 并安装 CLI +#### 下载 Istio 1.3.3 并安装 CLI ```bash -curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.4 sh - -cd istio-1.2.4/ +curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.3.3 sh - +cd istio-1.3.3/ export PATH=$PWD/bin:$PATH ``` diff --git a/README_en.md b/README_en.md index 4499f26..6f24451 100644 --- a/README_en.md +++ b/README_en.md @@ -4,7 +4,8 @@ NOTE: -* The master branch is tested with Docker Desktop for Mac/Windows version 2.1.2.x (with Docker CE 19.03.2 and Kubernetes 1.14.6). +* The master branch is tested with Docker Desktop for Mac/Windows version 2.1.4.x (with Docker CE 19.03.3 and Kubernetes 1.15.4). + * If you want to use 2.1.3.x (with Docker CE 19.03.2 and Kubernetes 1.14.6), please use the v1.14.6 ```git checkout v1.14.6``` * If you want to use 2.1.1.x (with Docker CE 19.03.0 and Kubernetes 1.14.3), please use the v1.14.3 ```git checkout v1.14.3``` * If you want to use 2.0.4.x (with Docker CE 19.03.0 and Kubernetes 1.14.1), please use the v1.14.1 ```git checkout v1.14.1``` * If you want to use v2.0.1.0/v2.0.2.0/v2.0.3.0 (with Docker CE 18.09.1 and Kubernetes 1.13.0), please use the v2.0.1.0 branch ```git checkout v2.0.0.2``` @@ -150,7 +151,7 @@ Install helm following the instruction on https://github.com/helm/helm/blob/mast brew install kubernetes-helm # Install Tiller into your Kubernetes cluster -helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.1 --skip-refresh +helm init --upgrade -i registry.cn-hangzhou.aliyuncs.com/google_containers/tiller:v2.14.3 --skip-refresh # update charts repo (Optional) helm repo update @@ -174,11 +175,11 @@ helm repo update More details can be found in https://istio.io/docs/setup/kubernetes/ -Download Istio 1.2.4 and install CLI +Download Istio 1.3.3 and install CLI ```bash -curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.2.4 sh - -cd istio-1.2.4/ +curl -L https://git.io/getLatestIstio | ISTIO_VERSION=1.3.3 sh - +cd istio-1.3.3/ export PATH=$PWD/bin:$PATH ``` diff --git a/images.properties b/images.properties index b18a40e..372922f 100644 --- a/images.properties +++ b/images.properties @@ -1,10 +1,9 @@ k8s.gcr.io/pause:3.1=registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.1 -k8s.gcr.io/kube-controller-manager:v1.14.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.14.6 -k8s.gcr.io/kube-scheduler:v1.14.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.14.6 -k8s.gcr.io/kube-proxy:v1.14.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.14.6 -k8s.gcr.io/kube-apiserver:v1.14.6=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.14.6 +k8s.gcr.io/kube-controller-manager:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.15.4 +k8s.gcr.io/kube-scheduler:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.15.4 +k8s.gcr.io/kube-proxy:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.15.4 +k8s.gcr.io/kube-apiserver:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.15.4 k8s.gcr.io/etcd:3.3.10=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.3.10 k8s.gcr.io/coredns:1.3.1=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.3.1 k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kubernetes-dashboard-amd64:v1.10.1 -quay.io/coreos/hyperkube:v1.7.6_coreos.0=registry.cn-hangzhou.aliyuncs.com/coreos_containers/hyperkube:v1.7.6_coreos.0 -quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.25.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 From 75f7c20e65fe762a85f06cc25d273648ccbb1752 Mon Sep 17 00:00:00 2001 From: AWu2 Date: Tue, 22 Oct 2019 13:45:59 +0800 Subject: [PATCH 2/3] docker desktop v2.1.0.4 kubernetes v1.14.7 --- images.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images.properties b/images.properties index 372922f..c8b5bf7 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/kube-controller-manager:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.15.4 -k8s.gcr.io/kube-scheduler:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.15.4 -k8s.gcr.io/kube-proxy:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.15.4 -k8s.gcr.io/kube-apiserver:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.15.4 +k8s.gcr.io/kube-controller-manager:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.14.7 +k8s.gcr.io/kube-scheduler:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.14.7 +k8s.gcr.io/kube-proxy:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.14.7 +k8s.gcr.io/kube-apiserver:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.14.7 k8s.gcr.io/etcd:3.3.10=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.3.10 k8s.gcr.io/coredns:1.3.1=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.3.1 k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kubernetes-dashboard-amd64:v1.10.1 From 66770f410fb9679a029a9a23ba264d103c66e837 Mon Sep 17 00:00:00 2001 From: Arnold Date: Tue, 22 Oct 2019 15:32:17 +0800 Subject: [PATCH 3/3] Revert "docker desktop v2.1.0.4 kubernetes v1.14.7" --- images.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images.properties b/images.properties index c8b5bf7..372922f 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/kube-controller-manager:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.14.7 -k8s.gcr.io/kube-scheduler:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.14.7 -k8s.gcr.io/kube-proxy:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.14.7 -k8s.gcr.io/kube-apiserver:v1.14.7=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.14.7 +k8s.gcr.io/kube-controller-manager:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.15.4 +k8s.gcr.io/kube-scheduler:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.15.4 +k8s.gcr.io/kube-proxy:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.15.4 +k8s.gcr.io/kube-apiserver:v1.15.4=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.15.4 k8s.gcr.io/etcd:3.3.10=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.3.10 k8s.gcr.io/coredns:1.3.1=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.3.1 k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kubernetes-dashboard-amd64:v1.10.1