Update default lb-method to: random two least_conn (#391)

* Random two least_conn is now the default lb-method as implemented in 5c7be23

Author: Dean-Coakley

examples/customization/README.md

@@ -42,7 +42,7 @@ The table below summarizes all of the options. For some of them, there are examp
 | N/A | `ingress-template` | Sets the NGINX configuration template for an Ingress resource. | By default the template is read from the file on the container. | [Custom Templates](../custom-templates). |
 | `nginx.org/location-snippets` | `location-snippets` | Sets a custom snippet in location context. | N/A | |
 | `nginx.org/server-snippets` | `server-snippets` | Sets a custom snippet in server context. | N/A | |
-| `nginx.org/lb-method` | `lb-method` | Sets the [load balancing method](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#choosing-a-load-balancing-method). To use the round-robin method, specify `"round_robin"`. | `"least_conn"` | |
+| `nginx.org/lb-method` | `lb-method` | Sets the [load balancing method](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#choosing-a-load-balancing-method). To use the round-robin method, specify `"round_robin"`. | `"random two least_conn"` | |
 | `nginx.org/listen-ports` | N/A | Configures HTTP ports that NGINX will listen on. | `[80]` | |
 | `nginx.org/listen-ports-ssl` | N/A | Configures HTTPS ports that NGINX will listen on. | `[443]` | |
 | N/A | `worker-processes` | Sets the value of the [worker_processes](http://nginx.org/en/docs/ngx_core_module.html#worker_processes) directive. | `auto` | |

examples/customization/nginx-config.yaml

@@ -45,7 +45,7 @@ data:
     if ($new_uri) {
         rewrite ^ $new_uri permanent;
     }
-  lb-method: "round_robin" # default is least_conn. Sets the load balancing method for upstreams. See https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#choosing-a-load-balancing-method
+  lb-method: "round_robin" # default is random two least_conn. Sets the load balancing method for upstreams. See https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#choosing-a-load-balancing-method
   location-snippets: | # No default. Pipe is used for multiple line snippets. Make sure the snippet is not a default value, in order to avoid duplication.
     proxy_temp_path  /var/nginx/proxy_temp;
     charset  koi8-r;

internal/nginx/config.go

@@ -92,7 +92,7 @@ func NewDefaultConfig() *Config {
 		SSLPorts:                   []int{443},
 		MaxFails:                   1,
 		FailTimeout:                "10s",
-		LBMethod:                   "least_conn",
+		LBMethod:                   "random two least_conn",
 		MainErrorLogLevel:          "notice",
 	}
 }

internal/nginx/configurator_test.go

@@ -234,7 +234,7 @@ func createCafeIngressEx() IngressEx {
 func createExpectedConfigForCafeIngressEx() IngressNginxConfig {
 	coffeeUpstream := Upstream{
 		Name:     "default-cafe-ingress-cafe.example.com-coffee-svc-80",
-		LBMethod: "least_conn",
+		LBMethod: "random two least_conn",
 		UpstreamServers: []UpstreamServer{
 			{
 				Address:     "10.0.0.1",
@@ -246,7 +246,7 @@ func createExpectedConfigForCafeIngressEx() IngressNginxConfig {
 	}
 	teaUpstream := Upstream{
 		Name:     "default-cafe-ingress-cafe.example.com-tea-svc-80",
-		LBMethod: "least_conn",
+		LBMethod: "random two least_conn",
 		UpstreamServers: []UpstreamServer{
 			{
 				Address:     "10.0.0.2",
@@ -434,7 +434,7 @@ func createMergeableCafeIngress() *MergeableIngresses {
 func createExpectedConfigForMergeableCafeIngress() IngressNginxConfig {
 	coffeeUpstream := Upstream{
 		Name:     "default-cafe-ingress-coffee-minion-cafe.example.com-coffee-svc-80",
-		LBMethod: "least_conn",
+		LBMethod: "random two least_conn",
 		UpstreamServers: []UpstreamServer{
 			{
 				Address:     "10.0.0.1",
@@ -446,7 +446,7 @@ func createExpectedConfigForMergeableCafeIngress() IngressNginxConfig {
 	}
 	teaUpstream := Upstream{
 		Name:     "default-cafe-ingress-tea-minion-cafe.example.com-tea-svc-80",
-		LBMethod: "least_conn",
+		LBMethod: "random two least_conn",
 		UpstreamServers: []UpstreamServer{
 			{
 				Address:     "10.0.0.2",