fix: backport changes from #64

Author: vknabel

api/v2/config/controller.go

@@ -132,9 +132,6 @@ func (c *NewControllerConfig) validate() error {
 	if c.SeedConfig == nil {
 		return fmt.Errorf("seed config must be specified")
 	}
-	if c.SeedNamespace == "" {
-		return fmt.Errorf("seed namespace must be specified")
-	}
 	if c.SeedAPIServerURL == "" {
 		return fmt.Errorf("seed api server url must be specified")
 	}

api/v2/validation/firewalldeployment.go

@@ -49,9 +49,7 @@ func (*firewallDeploymentValidator) validateSpec(log logr.Logger, f *v2.Firewall
 		})
 		if err != nil {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), f.Selector, ""))
-		}
-
-		if !selector.Empty() {
+		} else if !selector.Empty() {
 			labels := labels.Set(f.Template.Labels)
 			if !selector.Matches(labels) {
 				allErrs = append(allErrs, field.Invalid(fldPath.Child("template", "metadata", "labels"), f.Template.Labels, "`selector` does not match template `labels`"))

main.go

@@ -110,7 +110,7 @@ func main() {
 		log.Fatalf("unable to create metal client %v", err)
 	}
 
-	seedMgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
+	mgrConfig := ctrl.Options{
 		Scheme: scheme,
 		Metrics: server.Options{
 			BindAddress: metricsAddr,
@@ -121,15 +121,21 @@ func main() {
 		}),
 		Cache: cache.Options{
 			SyncPeriod: &reconcileInterval,
-			DefaultNamespaces: map[string]cache.Config{
-				namespace: {},
-			},
 		},
 		HealthProbeBindAddress:  healthAddr,
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "firewall-controller-manager-leader-election",
 		GracefulShutdownTimeout: &gracefulShutdownTimeout,
-	})
+	}
+
+	if namespace != "" {
+		l.Info("running in dedicated namespace only", "namespace", namespace)
+		mgrConfig.Cache.DefaultNamespaces = map[string]cache.Config{
+			namespace: {},
+		}
+	}
+
+	seedMgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), mgrConfig)
 	if err != nil {
 		log.Fatalf("unable to setup firewall-controller-manager %v", err)
 	}