Network: firewall controller webhook uniqe table name

liqotech · Dec 6, 2023 · 25944b1 · 25944b1
1 parent 1923408
commit 25944b1
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/pkg/liqo-controller-manager/webhooks/firewallconfiguration/table.go b/pkg/liqo-controller-manager/webhooks/firewallconfiguration/table.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 
+	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	networkingv1alpha1 "github.com/liqotech/liqo/apis/networking/v1alpha1"
@@ -41,7 +42,8 @@ func checkUniqueChainName(chains []firewallapi.Chain) error {
 
 // checkImmutableTableName checks if the table name is immutable.
 func checkImmutableTableName(fwcfg, oldFwcfg *networkingv1alpha1.FirewallConfiguration) error {
-	if oldFwcfg.Spec.Table.Name != fwcfg.Spec.Table.Name {
+	if fwcfg.Spec.Table.Name != nil && oldFwcfg.Spec.Table.Name != nil &&
+		oldFwcfg.Spec.Table.Name != fwcfg.Spec.Table.Name {
 		return fmt.Errorf("table name is immutable")
 	}
 	return nil
@@ -60,17 +62,13 @@ func checkUniqueTableName(ctx context.Context, cl client.Client, currentFwcfg *n
 	if err := cl.List(ctx, &fwcfglist); err != nil {
 		return err
 	}
+	labelselector := labels.SelectorFromSet(currentFwcfg.GetLabels())
 	for i := range fwcfglist.Items {
-		if fwcfglist.Items[i].UID == currentFwcfg.UID {
-			continue
-		}
-		fwcfg := fwcfglist.Items[i]
-		tableName := fwcfg.Spec.Table.Name
-		if tableName == nil {
-			return fmt.Errorf("table name is nil")
-		}
-		if *tableName == *currentTableName {
-			return fmt.Errorf("table name %v is duplicated", *tableName)
+		if fwcfglist.Items[i].Spec.Table.Name == currentFwcfg.Spec.Table.Name &&
+			labelselector.Matches(labels.Set(fwcfglist.Items[i].GetLabels())) &&
+			fwcfglist.Items[i].UID != currentFwcfg.UID {
+			return fmt.Errorf("table name %s with labels %s already used",
+				*currentTableName, currentFwcfg.GetLabels())
 		}
 	}
 	return nil