Merge pull request #19 from aledbf/fix-vrid

Use vrid flag in template
aledbf · Sep 18, 2017 · 4c35010 · 4c35010
2 parents 9006844 + bcfc3e6
commit 4c35010
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # 0.0 shouldn't clobber any release builds
-TAG = 0.19
+TAG = 0.20
 PREFIX = aledbf/kube-keepalived-vip
 BUILD_IMAGE = build-keepalived
 PKG = github.com/aledbf/kube-keepalived-vip

diff --git a/pkg/controller/main.go b/pkg/controller/main.go
@@ -184,6 +184,22 @@ func (ipvsc *ipvsControllerController) getServices(cfgMap *apiv1.ConfigMap) []vi
 	// k -> IP to use
 	// v -> <namespace>/<service name>:<lvs method>
 	for externalIP, nsSvcLvs := range cfgMap.Data {
+		if nsSvcLvs == "" {
+			// if target is empty string we will not forward to any service but
+			// instead just configure the IP on the machine and let it up to
+			// another Pod or daemon to bind to the IP address
+			svcs = append(svcs, vip{
+				Name:      "",
+				IP:        externalIP,
+				Port:      0,
+				LVSMethod: "VIP",
+				Backends:  nil,
+				Protocol:  "TCP",
+			})
+			glog.V(2).Infof("Adding VIP only service: %v", externalIP)
+			continue
+		}
+
 		ns, svc, lvsm, err := parseNsSvcLVS(nsSvcLvs)
 		if err != nil {
 			glog.Warningf("%v", err)

diff --git a/rootfs/keepalived.tmpl b/rootfs/keepalived.tmpl
@@ -20,7 +20,7 @@ vrrp_script chk_haproxy {
 vrrp_instance vips {
   state BACKUP
   interface {{ $iface }}
-  virtual_router_id 50
+  virtual_router_id {{ .vrid }}
   priority {{ .priority }}
   nopreempt
   advert_int 1
@@ -51,6 +51,9 @@ vrrp_instance vips {
 
 {{ if not .proxyMode }}
 {{ range $i, $svc := .svcs }}
+{{ if eq $svc.LVSMethod "VIP" }} 
+# VIP Service with no pods: {{ $svc.IP }} 
+{{ else }}
 # Service: {{ $svc.Name }}
 virtual_server {{ $svc.IP }} {{ $svc.Port }} {
   delay_loop 5

diff --git a/vip-daemonset-proxy.yaml b/vip-daemonset-proxy.yaml
@@ -22,7 +22,7 @@ spec:
           volumeMounts:
             - name: haproxy
               mountPath: /etc/haproxy
-        - image: aledbf/kube-keepalived-vip:0.19
+        - image: aledbf/kube-keepalived-vip:0.20
           name: kube-keepalived-vip
           securityContext:
             privileged: true

diff --git a/vip-daemonset.yaml b/vip-daemonset.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       hostNetwork: true
       containers:
-        - image: aledbf/kube-keepalived-vip:0.19
+        - image: aledbf/kube-keepalived-vip:0.20
           name: kube-keepalived-vip
           imagePullPolicy: Always
           securityContext: