fix(gwsync): sync externals with prefix to avoid conflicts

Signed-off-by: Sergei Lukianov <[email protected]>

Author: Frostman

api/vpc/v1beta1/external_types.go

@@ -28,6 +28,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
+const (
+	VPCInfoExtPrefix = "ext."
+)
+
 var communityCheck = regexp.MustCompile("^(6553[0-5]|655[0-2][0-9]|654[0-9]{2}|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5][0-9]{4}|[1-9][0-9]{1,3}|[0-9]):(6553[0-5]|655[0-2][0-9]|654[0-9]{2}|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5][0-9]{4}|[1-9][0-9]{1,3}|[0-9])$")
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.

api/vpc/v1beta1/vpc_types.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"net"
 	"slices"
+	"strings"
 
 	"github.com/pkg/errors"
 	"go.githedgehog.com/fabric/api/meta"
@@ -336,6 +337,9 @@ func (vpc *VPC) Validate(ctx context.Context, kube kclient.Reader, fabricCfg *me
 	if len(vpc.Name) > 11 {
 		return nil, errors.Errorf("name %s is too long, must be <= 11 characters", vpc.Name)
 	}
+	if strings.HasPrefix(vpc.Name, VPCInfoExtPrefix) {
+		return nil, errors.Errorf("vpc name cannot start with '%s': %s", VPCInfoExtPrefix, vpc.Name)
+	}
 	if vpc.Spec.IPv4Namespace == "" {
 		return nil, errors.Errorf("ipv4Namespace is required")
 	}

pkg/ctrl/gw_vpc_sync.go renamed to pkg/ctrl/gw_sync.go

@@ -6,6 +6,7 @@ package ctrl
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"go.githedgehog.com/fabric/api/meta"
 	vpcapi "go.githedgehog.com/fabric/api/vpc/v1beta1"
@@ -169,10 +170,14 @@ func (r *GwExternalSync) enqueueForVPCInfo(ctx context.Context, obj kclient.Obje
 		return nil
 	}
 
+	if !strings.HasPrefix(vpcInfo.Name, vpcapi.VPCInfoExtPrefix) {
+		return nil
+	}
+
 	return []reconcile.Request{
 		{NamespacedName: ktypes.NamespacedName{
 			Namespace: vpcInfo.Namespace,
-			Name:      vpcInfo.Name,
+			Name:      strings.TrimPrefix(vpcInfo.Name, vpcapi.VPCInfoExtPrefix),
 		}},
 	}
 }
@@ -204,12 +209,12 @@ func (r *GwExternalSync) Reconcile(ctx context.Context, req kctrl.Request) (kctr
 
 	subnets := map[string]*gwapi.VPCInfoSubnet{}
 	// FIXME: the external spec does not have the prefixes we are importing, they are part of the externalPeering
-	subnets["internet"] = &gwapi.VPCInfoSubnet{
+	subnets["external"] = &gwapi.VPCInfoSubnet{
 		CIDR: "0.0.0.0/0",
 	}
 
 	vpcInfo := &gwapi.VPCInfo{ObjectMeta: kmetav1.ObjectMeta{
-		Name:      external.Name,
+		Name:      vpcapi.VPCInfoExtPrefix + external.Name,
 		Namespace: external.Namespace,
 	}}
 	if op, err := ctrlutil.CreateOrUpdate(ctx, r.Client, vpcInfo, func() error {