From 71247643d7d22463e71e40436a2d601c98b08453 Mon Sep 17 00:00:00 2001 From: sunlintong Date: Fri, 30 Mar 2018 16:48:54 +0800 Subject: [PATCH] resolve conflict --- addons/kube-ingress-aws-controller/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/kube-ingress-aws-controller/README.md b/addons/kube-ingress-aws-controller/README.md index af5d67c6cd..a1e2d69231 100644 --- a/addons/kube-ingress-aws-controller/README.md +++ b/addons/kube-ingress-aws-controller/README.md @@ -16,7 +16,7 @@ Advantages: - it uses Cloudformation instead of API calls for safety reasons, because if use Kubernetes in AWS at scale you will get rate limited from AWS sooner or later - it does not have routes limitations from AWS - you can use managed certificates like ACM, but also use you purchased certificates using IAM certificates -- it automatically finds the best matching ACM and IAM certifacte for your ingress, but you can also provide hostnames or the ARN to influence the certificate/ALB lookup +- it automatically finds the best matching ACM and IAM certificate for your ingress, but you can also provide hostnames or the ARN to influence the certificate/ALB lookup - you are free to use an http router implementation of your choice, which can implement more features like green-blue deployments