Merge pull request #165 from srl-labs/fix/disable-expose-reconcile-issue

carlmontanari · web-flow · commit bf8e8ed0d94a · 2024-08-09T14:30:42.000-07:00
fix: dont let deepequal freak out on empty vs nil slice when disableExpose is true
diff --git a/controllers/topology/definitioncontainerlab.go b/controllers/topology/definitioncontainerlab.go
@@ -361,6 +361,10 @@ func (p *containerlabDefinitionProcessor) processConfigForNode(
 
 		deepCopiedDefaults.Ports = defaultPorts
 		nodeDefinition.Ports = nodePorts
+	} else {
+		// zero value of slice is nil, that breaks deep equal checks later, so ensure we set to
+		// a non-zero (but empty) slice
+		nodeDefinition.Ports = []string{}
 	}
 
 	p.reconcileData.ResolvedConfigs[nodeName] = &clabernetesutilcontainerlab.Config{

Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,10 @@ func (p *containerlabDefinitionProcessor) processConfigForNode(`
`361`	`361`
`362`	`362`	`deepCopiedDefaults.Ports = defaultPorts`
`363`	`363`	`nodeDefinition.Ports = nodePorts`
	`364`	`+ } else {`
	`365`	`+ // zero value of slice is nil, that breaks deep equal checks later, so ensure we set to`
	`366`	`+ // a non-zero (but empty) slice`
	`367`	`+ nodeDefinition.Ports = []string{}`
`364`	`368`	`}`
`365`	`369`
`366`	`370`	`p.reconcileData.ResolvedConfigs[nodeName] = &clabernetesutilcontainerlab.Config{`