From 9a9e2f6eafe34f2ec0362e51d596981ae3c8a5f1 Mon Sep 17 00:00:00 2001 From: Li Yi Date: Thu, 27 Jan 2022 17:31:27 +0800 Subject: [PATCH] Update to Kubernetes v1.22.5 and Ingress controller v1.1.1 --- README.md | 9 +++++---- README_en.md | 1 + images.properties | 3 ++- sample/ingress.yaml | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 63e229a..6f2a18a 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 4.3.0 (包含 Docker CE 20.10.11 和 Kubernetes 1.22.4) 版本测试通过 +* 当前 master 分支已经在 Docker for Mac/Windows 4.4.2 (包含 Docker CE 20.10.12 和 Kubernetes 1.22.5) 版本测试通过 * 如果需要测试其他版本，请查看 Docker Desktop版本，Docker -> About Docker Desktop ![about](images/about.png) + * 如Kubernetes版本为 v1.22.5, 请使用下面命令切换 [v1.22.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.5) ```git checkout v1.22.5``` * 如Kubernetes版本为 v1.22.4, 请使用下面命令切换 [v1.22.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.22.4) ```git checkout v1.22.4``` * 如Kubernetes版本为 v1.21.5, 请使用下面命令切换 [v1.21.5 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.5) ```git checkout v1.21.5``` * 如Kubernetes版本为 v1.21.4, 请使用下面命令切换 [v1.21.4 分支](https://github.com/AliyunContainerService/k8s-for-docker-desktop/tree/v1.21.4) ```git checkout v1.21.4``` @@ -115,7 +116,7 @@ kubectl get nodes #### 部署 Kubernetes dashboard ```shell -$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.4.0/aio/deploy/recommended.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.4.0/aio/deploy/recommended.yaml ``` 或 @@ -188,7 +189,7 @@ Win: %UserProfile%\.kube\config 安装 ```shell -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.0.4/deploy/static/provider/cloud/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.1/deploy/static/provider/cloud/deploy.yaml ``` 验证 @@ -229,7 +230,7 @@ kubectl delete -f sample/ingress.yaml #### 删除 Ingress ```shell -kubectl delete -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.0.4/deploy/static/provider/cloud/deploy.yaml +kubectl delete -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.1/deploy/static/provider/cloud/deploy.yaml ``` ### 安装 Helm diff --git a/README_en.md b/README_en.md index 369d8a1..d7cc847 100644 --- a/README_en.md +++ b/README_en.md @@ -7,6 +7,7 @@ NOTE: * The master branch is tested with Docker Desktop for Mac/Windows version 4.3.0 (with Docker CE 20.10.11 and Kubernetes 1.22.4). * If you want to use with other version, pls check version of Kubernetes，Docker -> About Docker Desktop ![about](images/about.png) + * For Kubernetes v1.22.5, please use the v1.22.5 branch ```git checkout v1.22.5``` * For Kubernetes v1.22.4, please use the v1.22.4 branch ```git checkout v1.22.4``` * For Kubernetes v1.21.4, please use the v1.21.1 branch ```git checkout v1.21.5``` * For Kubernetes v1.21.4, please use the v1.21.1 branch ```git checkout v1.21.4``` diff --git a/images.properties b/images.properties index f11e361..5e46a38 100644 --- a/images.properties +++ b/images.properties @@ -5,4 +5,5 @@ k8s.gcr.io/kube-proxy:v1.22.5=registry.cn-hangzhou.aliyuncs.com/google_container k8s.gcr.io/kube-apiserver:v1.22.5=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.22.5 k8s.gcr.io/etcd:3.5.0-0=registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.0-0 k8s.gcr.io/coredns/coredns:v1.8.4=registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.8.4 -quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:0.26.1 +k8s.gcr.io/ingress-nginx/controller:v1.1.1=registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller:v1.1.1 +k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen:v1.1.1 diff --git a/sample/ingress.yaml b/sample/ingress.yaml index e40a9cc..aae5a2d 100644 --- a/sample/ingress.yaml +++ b/sample/ingress.yaml @@ -4,6 +4,7 @@ metadata: name: example-ingress annotations: ingress.kubernetes.io/rewrite-target: / + kubernetes.io/ingress.class: nginx spec: rules: - http: