Merge tag 'v1.4.0-rc5' into master

templates/consul_catalog.tmpl

@@ -17,8 +17,12 @@
   {{end}}
 
   [backends."backend-{{$service}}".loadbalancer]
-    sticky = {{getAttribute "backend.loadbalancer.sticky" .Attributes "false"}}
     method = "{{getAttribute "backend.loadbalancer" .Attributes "wrr"}}"
+    sticky = {{getAttribute "backend.loadbalancer.sticky" .Attributes "false"}}
+    {{if hasStickinessLabel .Attributes}}
+    [Backends."backend-{{$service}}".LoadBalancer.Stickiness]
+      cookieName = {{getStickinessCookieName .Attributes}}
+    {{end}}
 
   {{if hasMaxconnAttributes .Attributes}}
   [backends."backend-{{$service}}".maxconn]

templates/docker.tmpl

@@ -8,7 +8,10 @@
     {{if hasLoadBalancerLabel $backend}}
     [backends.backend-{{$backendName}}.loadbalancer]
       method = "{{getLoadBalancerMethod $backend}}"
-      sticky = {{getSticky $backend}}
+      {{if hasStickinessLabel $backend}}
+      [Backends."{{$backendName}}".LoadBalancer.Stickiness]
+        cookieName = {{getStickinessCookieName $backend}}
+      {{end}}
     {{end}}
 
     {{if hasMaxConnLabels $backend}}

templates/ecs.tmpl

@@ -1,7 +1,10 @@
 [backends]{{range $serviceName, $instances := .Services}}
   [backends.backend-{{ $serviceName }}.loadbalancer]
-    sticky = {{ getLoadBalancerSticky $instances}}
     method = "{{ getLoadBalancerMethod $instances}}"
+    {{if hasStickinessLabel $instances}} 
+    [Backends.backend-{{ $serviceName }}.LoadBalancer.Stickiness]
+      cookieName = {{getStickinessCookieName $instances}}
+    {{end}}
 
   {{range $index, $i := $instances}}
     [backends.backend-{{ $i.Name }}.servers.server-{{ $i.Name }}{{ $i.ID }}]

templates/kubernetes.tmpl

@@ -6,8 +6,9 @@
     {{end}}
     [backends."{{$backendName}}".loadbalancer]
       method = "{{$backend.LoadBalancer.Method}}"
-      {{if $backend.LoadBalancer.Sticky}}
-          sticky = true
+      {{if $backend.LoadBalancer.Stickiness}}
+      [Backends."{{$backendName}}".LoadBalancer.Stickiness]
+        cookieName = {{$backend.LoadBalancer.Stickiness.CookieName}}
       {{end}}
     {{range $serverName, $server := $backend.Servers}}
     [backends."{{$backendName}}".servers."{{$serverName}}"]

templates/kv.tmpl

@@ -3,25 +3,29 @@
 
 [backends]{{range $backends}}
 {{$backend := .}}
+{{$backendName := Last $backend}}
 {{$servers := ListServers $backend }}
 
 {{$circuitBreaker := Get "" . "/circuitbreaker/" "expression"}}
 {{with $circuitBreaker}}
-[backends."{{Last $backend}}".circuitBreaker]
+[backends."{{$backendName}}".circuitBreaker]
     expression = "{{$circuitBreaker}}"
 {{end}}
 
 {{$loadBalancer := Get "" . "/loadbalancer/" "method"}}
-{{$sticky := Get "false" . "/loadbalancer/" "sticky"}}
 {{with $loadBalancer}}
-[backends."{{Last $backend}}".loadBalancer]
+[backends."{{$backendName}}".loadBalancer]
     method = "{{$loadBalancer}}"
-    sticky = {{$sticky}}
+    sticky = {{ Get "false" . "/loadbalancer/" "sticky" }}
+    {{if hasStickinessLabel $backend}}
+    [Backends."{{$backendName}}".LoadBalancer.Stickiness]
+      cookieName = {{getStickinessCookieName $backend}}
+    {{end}}
 {{end}}
 
 {{$healthCheck := Get "" . "/healthcheck/" "path"}}
 {{with $healthCheck}}
-[backends."{{Last $backend}}".healthCheck]
+[backends."{{$backendName}}".healthCheck]
     path = "{{$healthCheck}}"
     interval = "{{ Get "30s" $backend "/healthcheck/" "interval" }}"
 {{end}}
@@ -30,14 +34,14 @@
 {{$maxConnExtractorFunc := Get "" . "/maxconn/" "extractorfunc"}}
 {{with $maxConnAmt}}
 {{with $maxConnExtractorFunc}}
-[backends."{{Last $backend}}".maxConn]
+[backends."{{$backendName}}".maxConn]
     amount = {{$maxConnAmt}}
     extractorFunc = "{{$maxConnExtractorFunc}}"
 {{end}}
 {{end}}
 
 {{range $servers}}
-[backends."{{Last $backend}}".servers."{{Last .}}"]
+[backends."{{$backendName}}".servers."{{Last .}}"]
     url = "{{Get "" . "/url"}}"
     weight = {{Get "0"  . "/weight"}}
 {{end}}

templates/marathon.tmpl

@@ -20,7 +20,10 @@
 {{ if hasLoadBalancerLabels $app }}
       [backends."backend{{getBackend $app $serviceName }}".loadbalancer]
         method = "{{getLoadBalancerMethod $app }}"
-        sticky = {{getSticky $app}}
+        {{if hasStickinessLabel $app}}
+        [Backends."backend{{getBackend $app $serviceName }}".LoadBalancer.Stickiness]
+          cookieName = {{getStickinessCookieName $app}}
+        {{end}}
 {{end}}
 {{ if hasCircuitBreakerLabels $app }}
       [backends."backend{{getBackend $app $serviceName }}".circuitbreaker]

templates/rancher.tmpl

@@ -8,7 +8,10 @@
     {{if hasLoadBalancerLabel $backend}}
     [backends.backend-{{$backendName}}.loadbalancer]
       method = "{{getLoadBalancerMethod $backend}}"
-      sticky = {{getSticky $backend}}
+      {{if hasStickinessLabel $backend}}
+      [Backends."{{$backendName}}".LoadBalancer.Stickiness]
+        cookieName = {{getStickinessCookieName $backend}}
+      {{end}}
     {{end}}
 
     {{if hasMaxConnLabels $backend}}