Fix Docker & KV templates for sticky

Signed-off-by: Emile Vauge <emile@vauge.com>

templates/docker.tmpl

@@ -1,24 +1,29 @@
-[backends]{{range .Containers}}
-    {{if hasCircuitBreakerLabel .}}
-    [backends.backend-{{getBackend .}}.circuitbreaker]
-      expression = "{{getCircuitBreakerExpression .}}"
+{{$backendServers := .Servers}}
+[backends]{{range $backendName, $backend := .Backends}}
+    {{if hasCircuitBreakerLabel $backend}}
+    [backends.backend-{{$backendName}}.circuitbreaker]
+      expression = "{{getCircuitBreakerExpression $backend}}"
     {{end}}
 
-    {{if hasLoadBalancerLabel .}}
-    [backends.backend-{{getBackend .}}.loadbalancer]
-      method = "{{getLoadBalancerMethod .}}"
-      sticky = {{getSticky . }}
+    {{if hasLoadBalancerLabel $backend}}
+    [backends.backend-{{$backendName}}.loadbalancer]
+      method = "{{getLoadBalancerMethod $backend}}"
+      sticky = {{getSticky $backend}}
     {{end}}
 
-    {{if hasMaxConnLabels .}}
-    [backends.backend-{{getBackend .}}.maxconn]
-      amount = {{getMaxConnAmount . }}
-      extractorfunc = "{{getMaxConnExtractorFunc . }}"
+    {{if hasMaxConnLabels $backend}}
+    [backends.backend-{{$backendName}}.maxconn]
+      amount = {{getMaxConnAmount $backend}}
+      extractorfunc = "{{getMaxConnExtractorFunc $backend}}"
     {{end}}
-    
-    [backends.backend-{{getBackend .}}.servers.server-{{.Name | replace "/" "" | replace "." "-"}}]
-    url = "{{getProtocol .}}://{{getIPAddress .}}:{{getPort .}}"
-    weight = {{getWeight .}}
+
+    {{$servers := index $backendServers $backendName}}
+    {{range $serverName, $server := $servers}}
+      [backends.backend-{{$backendName}}.servers.server-{{$server.Name | replace "/" "" | replace "." "-"}}]
+      url = "{{getProtocol $server}}://{{getIPAddress $server}}:{{getPort $server}}"
+      weight = {{getWeight $server}}
+    {{end}}
+
 {{end}}
 
 [frontends]{{range $frontend, $containers := .Frontends}}

templates/kv.tmpl

@@ -12,9 +12,11 @@
 {{end}}
 
 {{$loadBalancer := Get "" . "/loadbalancer/" "method"}}
+{{$sticky := Get "false" . "/loadbalancer/" "sticky"}}
 {{with $loadBalancer}}
 [backends."{{Last $backend}}".loadBalancer]
     method = "{{$loadBalancer}}"
+    sticky = {{$sticky}}
 {{end}}
 
 {{$maxConnAmt := Get "" . "/maxconn/" "amount"}}