feedback

controllers/policyendpoints_controller_test.go

@@ -329,7 +329,7 @@ func TestDeriveIngressAndEgressFirewallRules(t *testing.T) {
 
 		mockClient := mock_client.NewMockClient(ctrl)
 		policyEndpointReconciler, _ := NewPolicyEndpointsReconciler(mockClient, logr.New(&log.NullLogSink{}),
-			false, false, false, false, 300, 524288)
+			false, false, false, false, 300, 262144)
 		var policyEndpointsList []string
 		policyEndpointsList = append(policyEndpointsList, tt.policyEndpointName)
 		policyEndpointReconciler.podIdentifierToPolicyEndpointMap.Store(tt.podIdentifier, policyEndpointsList)
@@ -748,7 +748,7 @@ func TestArePoliciesAvailableInLocalCache(t *testing.T) {
 
 		mockClient := mock_client.NewMockClient(ctrl)
 		policyEndpointReconciler, _ := NewPolicyEndpointsReconciler(mockClient, logr.New(&log.NullLogSink{}),
-			false, false, false, false, 300, 524288)
+			false, false, false, false, 300, 262144)
 		var policyEndpointsList []string
 		policyEndpointsList = append(policyEndpointsList, tt.policyEndpointName...)
 		policyEndpointReconciler.podIdentifierToPolicyEndpointMap.Store(tt.podIdentifier, policyEndpointsList)
@@ -994,7 +994,7 @@ func TestDeriveFireWallRulesPerPodIdentifier(t *testing.T) {
 
 		mockClient := mock_client.NewMockClient(ctrl)
 		policyEndpointReconciler, _ := NewPolicyEndpointsReconciler(mockClient, logr.New(&log.NullLogSink{}),
-			false, false, false, false, 300, 524288)
+			false, false, false, false, 300, 262144)
 		var policyEndpointsList []string
 		policyEndpointsList = append(policyEndpointsList, tt.policyEndpointName)
 		policyEndpointReconciler.podIdentifierToPolicyEndpointMap.Store(tt.podIdentifier, policyEndpointsList)

main.go

@@ -83,7 +83,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	if !validControllerFlags(ctrlConfig) {
+	err = ctrlConfig.ValidControllerFlags() 
+	if err != nil{
 		setupLog.Error(err, "Controller flags validation failed")
 		os.Exit(1)
 	}
@@ -141,13 +142,3 @@ func getLoggerWithLogLevel(logLevel string, logFilePath string) (logr.Logger, er
 	ctrlLogger := logger.New(logLevel, logFilePath)
 	return zapr.NewLogger(ctrlLogger), nil
 }
-
-// validate controller flags
-func validControllerFlags(ctrlConfig config.ControllerConfig) bool {
-	//validate conntrack cache table size
-	if ctrlConfig.ConntrackCacheTableSize < (32*1024) || ctrlConfig.ConntrackCacheTableSize > (1024*1024) {
-		setupLog.Info("Invalid conntrack cache table size, should be between 32K and 1024K")
-		return false
-	}
-	return true
-}

pkg/config/controller_config.go

@@ -1,6 +1,9 @@
 package config
 
-import "github.com/spf13/pflag"
+import (
+	"github.com/spf13/pflag"
+	"errors"
+)
 
 const (
 	flagLogLevel                       = "log-level"
@@ -61,3 +64,12 @@ func (cfg *ControllerConfig) BindFlags(fs *pflag.FlagSet) {
 
 	cfg.RuntimeConfig.BindFlags(fs)
 }
+
+// Validate controller flags
+func (cfg *ControllerConfig) ValidControllerFlags() error {
+	// Validate conntrack cache table size
+	if cfg.ConntrackCacheTableSize < (32*1024) || cfg.ConntrackCacheTableSize > (1024*1024) {
+		return errors.New("Invalid conntrack cache table size, should be between 32K and 1024K")
+	}
+	return nil
+}