[ctrl] fix disabling vni gen for non spine leaf

githedgehog · Dec 14, 2023 · 1860dda · 1860dda
1 parent dd44f1a
commit 1860dda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/ctrl/agent/agent_ctrl.go b/pkg/ctrl/agent/agent_ctrl.go
@@ -398,7 +398,7 @@ func (r *AgentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 
 	vnis := map[string]uint32{}
 
-	if r.Cfg.FabricMode == config.FabricModeCollapsedCore {
+	if r.Cfg.FabricMode == config.FabricModeSpineLeaf {
 		for _, vpc := range vpcList.Items {
 			if _, exists := vpcs[vpc.Name]; !exists {
 				continue

diff --git a/pkg/ctrl/vpc/vpc_ctrl.go b/pkg/ctrl/vpc/vpc_ctrl.go
@@ -130,6 +130,10 @@ func (r *VPCReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 }
 
 func (r *VPCReconciler) ensureVNIs(ctx context.Context, vpc *vpcapi.VPC) error {
+	if r.Cfg.FabricMode != config.FabricModeSpineLeaf {
+		return nil
+	}
+
 	l := log.FromContext(ctx)
 
 	if vpc.Status.VNI == 0 {