From fd7e5b3c424be3df8e9a369798f63102d412dbcc Mon Sep 17 00:00:00 2001
From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Date: Wed, 6 Nov 2024 09:09:53 +0100
Subject: [PATCH] default to memifEnabled true

This patch enables memif support by default. Memif support has been
in beta for the last two years and has gone through extended testing.
As this is a major differentiator for the Calico/VPP integration,
3.29.0 release is a good candidate for making it GA.

Please not that pods will still be required to export the relevant
annotation for it to be actually configured by the CNI.

Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
---
 config/config.go | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/config/config.go b/config/config.go
index d169911e..3fcda0ca 100644
--- a/config/config.go
+++ b/config/config.go
@@ -310,24 +310,12 @@ type CalicoVppFeatureGatesConfigType struct {
 }
 
 func (self *CalicoVppFeatureGatesConfigType) Validate() (err error) {
-	/* disable by default as it might impact security */
-	if self.MemifEnabled == nil {
-		self.MemifEnabled = &False
-	}
-	if self.VCLEnabled == nil {
-		self.VCLEnabled = &False
-	}
-	if self.MultinetEnabled == nil {
-		self.MultinetEnabled = &False
-	}
-
-	if self.SRv6Enabled == nil {
-		self.SRv6Enabled = &False
-	}
-	if self.IPSecEnabled == nil {
-		self.IPSecEnabled = &False
-	}
-	return
+	self.MemifEnabled = DefaultToPtr(self.MemifEnabled, true)
+	self.VCLEnabled = DefaultToPtr(self.VCLEnabled, false)
+	self.MultinetEnabled = DefaultToPtr(self.MultinetEnabled, false)
+	self.SRv6Enabled = DefaultToPtr(self.SRv6Enabled, false)
+	self.IPSecEnabled = DefaultToPtr(self.IPSecEnabled, false)
+	return nil
 }
 
 func (self *CalicoVppFeatureGatesConfigType) String() string {
@@ -358,9 +346,7 @@ func (self *CalicoVppIpsecConfigType) GetIpsecNbAsyncCryptoThread() int {
 }
 
 func (self *CalicoVppIpsecConfigType) Validate() (err error) {
-	if self.CrossIpsecTunnels == nil {
-		self.CrossIpsecTunnels = &False
-	}
+	self.CrossIpsecTunnels = DefaultToPtr(self.CrossIpsecTunnels, false)
 	return
 }
 
@@ -718,3 +704,10 @@ func PrintAgentConfig(log *logrus.Logger) {
 	}
 	PrintEnvVarConfig(log)
 }
+
+func DefaultToPtr[T any](ptr *T, defaultV T) *T {
+	if ptr == nil {
+		return &defaultV
+	}
+	return ptr
+}