From 6537ff3ebf1cd8395964743c397e0c41cb54738d Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Fri, 20 Oct 2017 22:38:27 -0300 Subject: [PATCH] Auto stash before merge of "master" and "master/master" --- CONTRIBUTING.md | 2 +- docs/development.md | 2 +- docs/examples/customization/custom-configuration/README.md | 2 +- docs/examples/customization/custom-errors/README.md | 2 +- docs/examples/customization/custom-headers/README.md | 4 ++-- docs/user-guide/annotations.md | 2 +- images/nginx-slim/README.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 375e9c8f6e..6c613702e6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ Follow either of the two links above to access the appropriate CLA and instructi ## Finding Things That Need Help -If you're new to the project and want to help, but don't know where to start, we have a semi-curated list of issues that should not need deep knowledge of the system. [Have a look and see if anything sounds interesting](https://github.com/kubernetes/ingress/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22help+wanted%22). Alternatively, read some of the docs on other controllers and try to write your own, file and fix any/all issues that come up, including gaps in documentation! +If you're new to the project and want to help, but don't know where to start, we have a semi-curated list of issues that should not need deep knowledge of the system. [Have a look and see if anything sounds interesting](https://github.com/kubernetes/ingress-nginx/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22help+wanted%22). Alternatively, read some of the docs on other controllers and try to write your own, file and fix any/all issues that come up, including gaps in documentation! ## Contributing a Patch diff --git a/docs/development.md b/docs/development.md index 90f77239f6..7bff024426 100644 --- a/docs/development.md +++ b/docs/development.md @@ -64,7 +64,7 @@ Build a raw server binary $ make build ``` -[TODO](https://github.com/kubernetes/ingress/issues/387): add more specific instructions needed for raw server binary. +[TODO](https://github.com/kubernetes/ingress-nginx/issues/387): add more specific instructions needed for raw server binary. Build a local container image diff --git a/docs/examples/customization/custom-configuration/README.md b/docs/examples/customization/custom-configuration/README.md index 96bae232b0..92a5331f48 100644 --- a/docs/examples/customization/custom-configuration/README.md +++ b/docs/examples/customization/custom-configuration/README.md @@ -16,7 +16,7 @@ metadata: ``` ``` -curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/customization/cutom-configuration/configmap.yaml \ +curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/examples/customization/custom-configuration/configmap.yaml \ | kubectl apply -f - ``` diff --git a/docs/examples/customization/custom-errors/README.md b/docs/examples/customization/custom-errors/README.md index c37240afb8..080f59a831 100644 --- a/docs/examples/customization/custom-errors/README.md +++ b/docs/examples/customization/custom-errors/README.md @@ -1,4 +1,4 @@ -This example shows how is possible to use a custom backend to render custom error pages. The code of this example is located here [custom-error-pages](https://github.com/kubernetes/ingress/tree/master/examples/customization/custom-errors/nginx) +This example shows how is possible to use a custom backend to render custom error pages. The code of this example is located here [custom-error-pages](https://github.com/kubernetes/ingress-nginx/tree/master/docs/examples/customization/custom-errors) The idea is to use the headers `X-Code` and `X-Format` that NGINX pass to the backend in case of an error to find out the best existent representation of the response to be returned. i.e. if the request contains an `Accept` header of type `json` the error should be in that format and not in `html` (the default in NGINX). diff --git a/docs/examples/customization/custom-headers/README.md b/docs/examples/customization/custom-headers/README.md index b33b8b7988..592c7ec881 100644 --- a/docs/examples/customization/custom-headers/README.md +++ b/docs/examples/customization/custom-headers/README.md @@ -5,10 +5,10 @@ use a ConfigMap to configure a custom list of headers to be passed to the upstre server ```console -curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/customization/custom-headers/configmap.yaml \ +curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/examples/customization/custom-headers/configmap.yaml \ | kubectl apply -f - -curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/customization/custom-headers/custom-headers.yaml \ +curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/docs/examples/customization/custom-headers/custom-headers.yaml \ | kubectl apply -f - ``` diff --git a/docs/user-guide/annotations.md b/docs/user-guide/annotations.md index 9a10e123e0..87aa9055fd 100644 --- a/docs/user-guide/annotations.md +++ b/docs/user-guide/annotations.md @@ -264,7 +264,7 @@ By default NGINX uses `http` to reach the services. Adding the annotation `ingre ### Service Upstream -By default the NGINX ingress controller uses a list of all endpoints (Pod IP/port) in the NGINX upstream configuration. This annotation disables that behavior and instead uses a single upstream in NGINX, the service's Cluster IP and port. This can be desirable for things like zero-downtime deployments as it reduces the need to reload NGINX configuration when Pods come up and down. See issue [#257](https://github.com/kubernetes/ingress/issues/257). +By default the NGINX ingress controller uses a list of all endpoints (Pod IP/port) in the NGINX upstream configuration. This annotation disables that behavior and instead uses a single upstream in NGINX, the service's Cluster IP and port. This can be desirable for things like zero-downtime deployments as it reduces the need to reload NGINX configuration when Pods come up and down. See issue [#257](https://github.com/kubernetes/ingress-nginx/issues/257). #### Known Issues diff --git a/images/nginx-slim/README.md b/images/nginx-slim/README.md index 060fc275c7..0a1b374a0b 100644 --- a/images/nginx-slim/README.md +++ b/images/nginx-slim/README.md @@ -1,5 +1,5 @@ -nginx 1.13.x base image using [ubuntu-slim](https://github.com/kubernetes/ingress/tree/master/images/ubuntu-slim) +nginx 1.13.x base image using [ubuntu-slim](https://github.com/kubernetes/ingress-nginx/tree/master/images/ubuntu-slim) nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP proxy server.