When upstream-hash-by annotation is used do not configure a lb algori…

…thm (#1858)
kubernetes · Dec 27, 2017 · 54cfad0 · 54cfad0
1 parent 85d97df
commit 54cfad0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
@@ -314,13 +314,11 @@ http {
 
 
     upstream {{ $upstream.Name }} {
-        # Load balance algorithm; empty for round robin, which is the default
-        {{ if ne $cfg.LoadBalanceAlgorithm "round_robin" }}
-        {{ $cfg.LoadBalanceAlgorithm }};
-        {{ end }}
-
         {{ if $upstream.UpstreamHashBy }}
         hash {{ $upstream.UpstreamHashBy }} consistent;
+        {{ else }}
+        # Load balance algorithm; empty for round robin, which is the default
+        {{ if ne $cfg.LoadBalanceAlgorithm "round_robin" }}{{ $cfg.LoadBalanceAlgorithm }};{{ end }}
         {{ end }}
 
         {{ if (gt $cfg.UpstreamKeepaliveConnections 0) }}