From c4c92bf152a7c7ae1f48cbb8b1f3a52a9bc9796d Mon Sep 17 00:00:00 2001 From: Stan Lagun Date: Wed, 15 Apr 2015 03:35:37 +0300 Subject: [PATCH] Skip built-in k8s services in HAProxy config Builtin k8s services "kubernetes" and "kubernetes-ro" caused port conflicts with installed applications if they use ports 80 and/or 43 Change-Id: Ibf7be47d0f63dffeae7553dc3ffe9f1903ccce8f Closes-Bug: #1444213 --- .../package/Resources/scripts/haproxy.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.tmpl b/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.tmpl index 4813df1..87e8983 100644 --- a/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.tmpl +++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy.tmpl @@ -8,10 +8,12 @@ defaults {{range $svc := ls "/registry/services/endpoints/default"}} {{$se := printf "/registry/services/endpoints/default/%s" $svc }}{{$ss := printf "/registry/services/specs/default/%s" $svc }} -{{$seKey := get $se}}{{$ssKey := get $ss}}{{$seJson := json $seKey.Value}}{{$ssJson := json $ssKey.Value}} -listen {{base $svc}} 0.0.0.0:{{$ssJson.port}} +{{$seKey := get $se}}{{$ssKey := get $ss}}{{$seJson := json $seKey.Value}}{{$ssJson := json $ssKey.Value}}{{$baseSvc := base $svc}} +{{if and (ne "kubernetes" $baseSvc) (ne "kubernetes-ro" $baseSvc)}} +listen {{$baseSvc}} 0.0.0.0:{{$ssJson.port}} mode tcp balance leastconn {{range $index, $endpoint := $seJson.endpoints}} server svr{{$index}} {{$endpoint}}{{end}} -{{end}} + +{{end}}{{end}}