add omitempty to topology.spec.connectivity

srl-labs · Jun 15, 2024 · 36c9e33 · 36c9e33
1 parent 35a645e
commit 36c9e33
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ cov:  ## Produce html coverage report; removes all the generated bits for sanity
 
 install-tools: ## Install lint/test tools
 	go install mvdan.cc/gofumpt@latest
-	go install github.com/daixiang0/gci@latest@latest
+	go install github.com/daixiang0/gci@latest
 	go install github.com/segmentio/golines@latest
 	go install gotest.tools/gotestsum@latest
 

diff --git a/apis/v1alpha1/topology.go b/apis/v1alpha1/topology.go
@@ -67,7 +67,7 @@ type TopologySpec struct {
 	// and/or fragmentation challenges.
 	// +kubebuilder:validation:Enum=vxlan;slurpeeth
 	// +kubebuilder:default=vxlan
-	Connectivity string `json:"connectivity"`
+	Connectivity string `json:"connectivity,omitempty"`
 }
 
 // TopologyStatus is the status for a Topology resource.

diff --git a/assets/crd/clabernetes.containerlab.dev_topologies.yaml b/assets/crd/clabernetes.containerlab.dev_topologies.yaml
@@ -594,7 +594,6 @@ spec:
                     type: object
                 type: object
             required:
-            - connectivity
             - definition
             - naming
             type: object

diff --git a/charts/clabernetes/crds/clabernetes.containerlab.dev_topologies.yaml b/charts/clabernetes/crds/clabernetes.containerlab.dev_topologies.yaml
@@ -594,7 +594,6 @@ spec:
                     type: object
                 type: object
             required:
-            - connectivity
             - definition
             - naming
             type: object

diff --git a/generated/openapi/openapi_generated.go b/generated/openapi/openapi_generated.go