Network: firewall controller webhook uniqe table name

liqotech · Dec 11, 2023 · 05ab5fb · 05ab5fb
1 parent d31bdc6
commit 05ab5fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/pkg/liqo-controller-manager/webhooks/firewallconfiguration/firewallconfiguration.go b/pkg/liqo-controller-manager/webhooks/firewallconfiguration/firewallconfiguration.go
@@ -90,10 +90,7 @@ func (w *webhookMutate) Handle(_ context.Context, req admission.Request) admissi
 		return admission.Errored(http.StatusBadRequest, err)
 	}
 
-	table := firewallConfiguration.Spec.Table
-	chains := table.Chains
-
-	generateRuleNames(chains)
+	generateRuleNames(firewallConfiguration.Spec.Table.Chains)
 
 	return w.CreatePatchResponse(&req, firewallConfiguration)
 }

diff --git a/pkg/liqo-controller-manager/webhooks/firewallconfiguration/table.go b/pkg/liqo-controller-manager/webhooks/firewallconfiguration/table.go
@@ -17,6 +17,7 @@ package firewallconfiguration
 import (
 	"context"
 	"fmt"
+	"maps"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -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,15 @@ func checkUniqueTableName(ctx context.Context, cl client.Client, currentFwcfg *n
 	if err := cl.List(ctx, &fwcfglist); err != nil {
 		return err
 	}
+
 	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 &&
+			maps.Equal(currentFwcfg.GetLabels(), fwcfglist.Items[i].GetLabels()) {
+			return fmt.Errorf("table name %s with labels %s already used",
+				*currentTableName, currentFwcfg.GetLabels())
 		}
 	}
 	return nil