From 7e5d0b61337f50a4df772fd370d0d28c118c51dd Mon Sep 17 00:00:00 2001 From: du Date: Thu, 7 Sep 2017 18:14:06 +0800 Subject: [PATCH 1/3] [nginx/README] remove obsolete sentence in deployment section --- controllers/nginx/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/controllers/nginx/README.md b/controllers/nginx/README.md index 8eb52a696..afc9186fb 100644 --- a/controllers/nginx/README.md +++ b/controllers/nginx/README.md @@ -115,7 +115,6 @@ $ kubectl create -f examples/default-backend.yaml ``` Follow the [example-deployment](../../examples/deployment/nginx/README.md) steps to deploy nginx-ingress-controller in Kubernetes cluster (you may prefer other type of workloads, like Daemonset, in production environment). -Loadbalancers are created via a ReplicationController or Daemonset: ## HTTP From 6b83a0fd04e2603f4a3f0388980f88c80a554b2a Mon Sep 17 00:00:00 2001 From: du Date: Thu, 7 Sep 2017 18:37:10 +0800 Subject: [PATCH 2/3] [nginx/Makefile] use conditional directive for TEMP_DIR --- controllers/nginx/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile index 4aebd4ac2..8fca2bc1b 100644 --- a/controllers/nginx/Makefile +++ b/controllers/nginx/Makefile @@ -54,7 +54,9 @@ endif # QEMUARCH=s390x #endif -TEMP_DIR := $(shell mktemp -d) +ifndef TEMP_DIR + TEMP_DIR := $(shell mktemp -d) +endif DOCKERFILE := $(TEMP_DIR)/rootfs/Dockerfile From bfaf95147743d20e8f7a889f6b117c9b5b23540a Mon Sep 17 00:00:00 2001 From: du Date: Thu, 7 Sep 2017 18:38:30 +0800 Subject: [PATCH 3/3] [nginx/README] fix console example of running Ingress controller --- controllers/nginx/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/nginx/README.md b/controllers/nginx/README.md index afc9186fb..c8069966c 100644 --- a/controllers/nginx/README.md +++ b/controllers/nginx/README.md @@ -102,9 +102,10 @@ Usage of : Before deploying the controller to production you might want to run it outside the cluster and observe it. ```console -$ make build +$ tmpdir=$(mktemp -d) +$ TEMP_DIR=${tmpdir} make build $ mkdir /etc/nginx-ssl -$ ./rootfs/nginx-ingress-controller --running-in-cluster=false --default-backend-service=kube-system/default-http-backend +$ ${tmpdir}/rootfs/nginx-ingress-controller --running-in-cluster=false --default-backend-service=kube-system/default-http-backend ``` ## Deployment