From 2b24494b559b2fb6aebcc2aa36982c71999fe56b Mon Sep 17 00:00:00 2001 From: Victor Trac Date: Sun, 31 Dec 2017 08:38:31 -0600 Subject: [PATCH] Fix publish-service patch and update README (#1867) --- deploy/README.md | 8 ++++---- deploy/patch-deployment.yaml | 1 - deploy/publish-service-patch.yaml | 7 +++++++ 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 deploy/patch-deployment.yaml create mode 100644 deploy/publish-service-patch.yaml diff --git a/deploy/README.md b/deploy/README.md index 8f7c22c75..871d58a8c 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -117,7 +117,7 @@ Patch the nginx ingress controller deployment to add the flag `--publish-service ```console kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \ - --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/patch-deployment.yaml)" + --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)" ``` For L4: @@ -159,7 +159,7 @@ Patch the nginx ingress controller deployment to add the flag `--publish-service ```console kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \ - --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/patch-deployment.yaml)" + --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)" ``` ```console @@ -187,7 +187,7 @@ Patch the nginx ingress controller deployment to add the flag `--publish-service ```console kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \ - --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/patch-deployment.yaml)" + --patch="$(curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)" ``` ```console @@ -264,4 +264,4 @@ and is setup to be used in the deployment [without-rbac](without-rbac.yaml) or [ - --configmap=$(POD_NAMESPACE)/nginx-configuration ``` -For information on using the config-map, see its [user-guide](../docs/user-guide/configmap.md). \ No newline at end of file +For information on using the config-map, see its [user-guide](../docs/user-guide/configmap.md). diff --git a/deploy/patch-deployment.yaml b/deploy/patch-deployment.yaml deleted file mode 100644 index 5959c83b1..000000000 --- a/deploy/patch-deployment.yaml +++ /dev/null @@ -1 +0,0 @@ -[{'op': 'replace', 'path': '/spec/template/spec/containers/0/args', 'value':['/nginx-ingress-controller','--default-backend-service=$(POD_NAMESPACE)/default-http-backend','--configmap=$(POD_NAMESPACE)/nginx-configuration','--tcp-services-configmap=$(POD_NAMESPACE)/tcp-services','--udp-services-configmap=$(POD_NAMESPACE)/udp-services','--annotations-prefix=nginx.ingress.kubernetes.io','--publish-service=$(POD_NAMESPACE)/ingress-nginx']}] \ No newline at end of file diff --git a/deploy/publish-service-patch.yaml b/deploy/publish-service-patch.yaml new file mode 100644 index 000000000..f8f52f772 --- /dev/null +++ b/deploy/publish-service-patch.yaml @@ -0,0 +1,7 @@ +[ + { + 'op': 'add', + 'path': '/spec/template/spec/containers/0/args/-', + 'value': '--publish-service=$(POD_NAMESPACE)/ingress-nginx' + } +]