Adds capability to specify a subnet for the VIP

Signed-off-by: Dan Finneran <[email protected]>
dockerpac · Nov 7, 2022 · 5e38c81 · 5e38c81
1 parent f052777
commit 5e38c81
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/pkg/kubevip/config_environment.go b/pkg/kubevip/config_environment.go
@@ -176,6 +176,12 @@ func ParseEnvironment(c *Config) error {
 		c.VIPCIDR = env
 	}
 
+	// Find vip address subnet
+	env = os.Getenv(vipSubnet)
+	if env != "" {
+		c.VIPSubnet = env
+	}
+
 	// Find Single Node
 	env = os.Getenv(vipSingleNode)
 	if env != "" {

diff --git a/pkg/kubevip/config_envvar.go b/pkg/kubevip/config_envvar.go
@@ -27,9 +27,12 @@ const (
 	//vipServicesInterface - defines the interface that the service vips should bind too
 	vipServicesInterface = "vip_servicesinterface"
 
-	//vipCidr - defines the cidr that the vip will use
+	//vipCidr - defines the cidr that the vip will use (for BGP)
 	vipCidr = "vip_cidr"
 
+	//vipSubnet - defines the subnet that the vip will use
+	vipSubnet = "vip_subnet"
+
 	//egressPodCidr - defines the cidr that egress will ignore
 	egressPodCidr = "egress_podcidr"
 

diff --git a/pkg/kubevip/config_generator.go b/pkg/kubevip/config_generator.go
@@ -67,7 +67,18 @@ func generatePodSpec(c *Config, imageVersion string, inCluster bool) *corev1.Pod
 			},
 		}
 		newEnvironment = append(newEnvironment, cidr...)
+	}
 
+	// If a subnet is required for the VIP
+	if c.VIPSubnet != "" {
+		// build environment variables
+		cidr := []corev1.EnvVar{
+			{
+				Name:  vipSubnet,
+				Value: c.VIPSubnet,
+			},
+		}
+		newEnvironment = append(newEnvironment, cidr...)
 	}
 
 	// If we're doing the hybrid mode

diff --git a/pkg/manager/services.go b/pkg/manager/services.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"time"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
@@ -86,6 +87,7 @@ func (sm *Manager) syncServices(ctx context.Context, service *v1.Service, wg *sy
 	defer wg.Done()
 
 	log.Debugf("[STARTING] Service Sync")
+
 	// Iterate through the synchronising services
 	foundInstance := false
 	newServiceAddress := service.Spec.LoadBalancerIP
@@ -119,6 +121,8 @@ func (sm *Manager) syncServices(ctx context.Context, service *v1.Service, wg *sy
 }
 
 func (sm *Manager) addService(service *v1.Service) error {
+	startTime := time.Now()
+
 	newService, err := NewInstance(service, sm.config)
 	if err != nil {
 		return err
@@ -157,7 +161,8 @@ func (sm *Manager) addService(service *v1.Service) error {
 			}
 		}
 	}
-	log.Debugf("[COMPLETE] Service Sync")
+	finishTime := time.Since(startTime)
+	log.Infof("[service] synchronised in %dms", finishTime.Milliseconds())
 
 	return nil
 }