Merge pull request #2912 from cornelius-keller/keepalived_with_notify

add option to use notfy scripts for keepalived
kubernetes-retired · Feb 11, 2019 · 1043fc9 · 1043fc9
2 parents 19c8d34 + 5124fda
commit 1043fc9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/keepalived-vip/Dockerfile b/keepalived-vip/Dockerfile
@@ -29,7 +29,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   ca-certificates \
   iproute2 \
   ipvsadm \
-  bash && \
+  bash \
+  jq \
+  curl && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 

diff --git a/keepalived-vip/controller.go b/keepalived-vip/controller.go
@@ -337,6 +337,8 @@ func newIPVSController(kubeClient *unversioned.Client, namespace string, useUnic
 
 	neighbors := getNodeNeighbors(nodeInfo, clusterNodes)
 
+	notify := os.Getenv("KEEPALIVED_NOTIFY")
+
 	execer := exec.New()
 	dbus := utildbus.New()
 	iptInterface := utiliptables.New(execer, dbus, utiliptables.ProtocolIpv4)
@@ -352,6 +354,7 @@ func newIPVSController(kubeClient *unversioned.Client, namespace string, useUnic
 		ipt:         iptInterface,
 		vrid:        vrid,
 		vrrpVersion: vrrpVersion,
+		notify:      notify,
 	}
 
 	ipvsc.syncQueue = NewTaskQueue(ipvsc.sync)

diff --git a/keepalived-vip/keepalived.go b/keepalived-vip/keepalived.go
@@ -51,6 +51,7 @@ type keepalived struct {
 	ipt         iptables.Interface
 	vrid        int
 	vrrpVersion int
+	notify      string
 }
 
 // WriteCfg creates a new keepalived configuration file.
@@ -76,6 +77,7 @@ func (k *keepalived) WriteCfg(svcs []vip) error {
 	conf["useUnicast"] = k.useUnicast
 	conf["vrid"] = k.vrid
 	conf["vrrpVersion"] = k.vrrpVersion
+	conf["notify"] = k.notify
 
 	if glog.V(2) {
 		b, _ := json.Marshal(conf)

diff --git a/keepalived-vip/keepalived.tmpl b/keepalived-vip/keepalived.tmpl
@@ -16,6 +16,7 @@ vrrp_instance vips {
   track_interface {
     {{ $iface }}
   }
+  {{ if .notify }} notify {{ .notify }} {{ end }}
 
   {{ if .useUnicast }}
   unicast_src_ip {{ .myIP }}