From b5d9ac891390af7b51d6e57784ca899b3afc7abc Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:13:50 +0100 Subject: [PATCH 1/7] adding documentation about --configmap command-line arg --- controllers/nginx/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 07c2285b0..4aa2cadee 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,7 +23,7 @@ There are 3 ways to customize NGINX: -1. [ConfigMap](#allowed-parameters-in-configuration-configmap): create a stand alone ConfigMap, use this if you want a different global configuration. +1. [ConfigMap](#allowed-parameters-in-configuration-configmap): create a stand alone ConfigMap, use this if you want a different global configuration. **NOTE** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments) 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap. From d583a170f541f88cdbefa89ecfdf2cd7b2dba443 Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:16:11 +0100 Subject: [PATCH 2/7] fixing indent --- controllers/nginx/configuration.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 4aa2cadee..903e4237e 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,7 +23,8 @@ There are 3 ways to customize NGINX: -1. [ConfigMap](#allowed-parameters-in-configuration-configmap): create a stand alone ConfigMap, use this if you want a different global configuration. **NOTE** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments) +1. [ConfigMap](#allowed-parameters-in-configuration-configmap): create a stand alone ConfigMap, use this if you want a different global configuration. + **NOTE** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments) 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap. From 44ab3cd10e8dadc49cd39f9c13cd09f31ddde2e0 Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:22:50 +0100 Subject: [PATCH 3/7] changing position --- controllers/nginx/configuration.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 903e4237e..38a809379 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,8 +23,7 @@ There are 3 ways to customize NGINX: -1. [ConfigMap](#allowed-parameters-in-configuration-configmap): create a stand alone ConfigMap, use this if you want a different global configuration. - **NOTE** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments) +1. **NOTE** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap. From c3fe768c09a544bcf5401263b9bb4fc64c4c6d38 Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:24:41 +0100 Subject: [PATCH 4/7] fixing --- controllers/nginx/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 38a809379..9a8881fac 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,7 +23,7 @@ There are 3 ways to customize NGINX: -1. **NOTE** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). +1. [ConfigMaps](#allowed-parameters-in-configuration-configmap) **NOTE:** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap. From 956f6d2f517589cff2122edc6c4d08eca6172d8f Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:26:38 +0100 Subject: [PATCH 5/7] fixing --- controllers/nginx/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 9a8881fac..fa905048f 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,7 +23,7 @@ There are 3 ways to customize NGINX: -1. [ConfigMaps](#allowed-parameters-in-configuration-configmap) **NOTE:** Please make sure you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). +1. [ConfigMaps](#allowed-parameters-in-configuration-configmap): You can create a different global configuration using ConfigMaps, however, **please make sure** you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap. From 412d2672adf7539187b4a7dfa3ad558499235e26 Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:27:35 +0100 Subject: [PATCH 6/7] fixing sentence --- controllers/nginx/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index fa905048f..1fc894e3b 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,7 +23,7 @@ There are 3 ways to customize NGINX: -1. [ConfigMaps](#allowed-parameters-in-configuration-configmap): You can create a different global configuration using ConfigMaps, however, **please make sure** you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). +1. [ConfigMaps](#allowed-parameters-in-configuration-configmap): You can create a different global configuration using ConfigMaps. **Please make sure** you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap. From 45a9280f86caa4073486b99b385830674d99e3f3 Mon Sep 17 00:00:00 2001 From: Khusro Jaleel Date: Thu, 14 Sep 2017 17:28:10 +0100 Subject: [PATCH 7/7] making bold --- controllers/nginx/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 1fc894e3b..8a7a9751c 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -23,7 +23,7 @@ There are 3 ways to customize NGINX: -1. [ConfigMaps](#allowed-parameters-in-configuration-configmap): You can create a different global configuration using ConfigMaps. **Please make sure** you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). +1. [ConfigMaps](#allowed-parameters-in-configuration-configmap): You can create a different global configuration using **ConfigMaps**. **Please make sure** you add the `--configmap` command-line argument when starting the controller for ConfigMaps to work! See the documentation [here](https://github.com/kubernetes/ingress/tree/master/controllers/nginx#command-line-arguments). For a complete list of all the parameters allowed inside the ConfigMap, see [ConfigMap](#allowed-parameters-in-configuration-configmap). 2. [annotations](#annotations): use this if you want a specific configuration for the site defined in the Ingress rule. 3. custom template: when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), custom [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change an through the ConfigMap.