chore: revert spurious omitempty changes

and rename ExternalL2Spec to ExternalL2 as requested

Signed-off-by: Emanuele Di Pascale <[email protected]>

Author: edipascale

api/vpc/v1beta1/external_types.go

@@ -36,7 +36,7 @@ var communityCheck = regexp.MustCompile("^(6553[0-5]|655[0-2][0-9]|654[0-9]{2}|6
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-type ExternalL2Spec struct {
+type ExternalL2 struct {
 	// Prefixes is the list of IPv4 prefixes reachable via the external
 	Prefixes []string `json:"prefixes,omitempty"`
 }
@@ -52,7 +52,7 @@ type ExternalSpec struct {
 	OutboundCommunity string `json:"outboundCommunity,omitempty"`
 	// L2 contains L2 specific parameters
 	// +optional
-	L2 *ExternalL2Spec `json:"l2,omitempty"`
+	L2 *ExternalL2 `json:"l2,omitempty"`
 }
 
 // ExternalStatus defines the observed state of External
@@ -69,24 +69,21 @@ type ExternalStatus struct{}
 // Users can do external peering with the external system by specifying the name of the External Object without need to
 // worry about the details of how external system is attached to the Fabric.
 type External struct {
-	kmetav1.TypeMeta `json:",inline"`
-	// +optional
-	kmetav1.ObjectMeta `json:"metadata"`
+	kmetav1.TypeMeta   `json:",inline"`
+	kmetav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// Spec is the desired state of the External
-	Spec ExternalSpec `json:"spec"`
+	Spec ExternalSpec `json:"spec,omitempty"`
 	// Status is the observed state of the External
-	// +optional
-	Status ExternalStatus `json:"status"`
+	Status ExternalStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
 // ExternalList contains a list of External
 type ExternalList struct {
 	kmetav1.TypeMeta `json:",inline"`
-	// +optional
-	kmetav1.ListMeta `json:"metadata"`
+	kmetav1.ListMeta `json:"metadata,omitempty"`
 	Items            []External `json:"items"`
 }
 

api/vpc/v1beta1/externalattachment_types.go

@@ -89,24 +89,21 @@ type ExternalAttachmentStatus struct{}
 // ExternalAttachment is a definition of how specific switch is connected with external system (External object).
 // Effectively it represents BGP peering between the switch and external system including all needed configuration.
 type ExternalAttachment struct {
-	kmetav1.TypeMeta `json:",inline"`
-	// +optional
-	kmetav1.ObjectMeta `json:"metadata"`
+	kmetav1.TypeMeta   `json:",inline"`
+	kmetav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// Spec is the desired state of the ExternalAttachment
 	Spec ExternalAttachmentSpec `json:"spec"`
 	// Status is the observed state of the ExternalAttachment
-	// +optional
-	Status ExternalAttachmentStatus `json:"status"`
+	Status ExternalAttachmentStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
 // ExternalAttachmentList contains a list of ExternalAttachment
 type ExternalAttachmentList struct {
 	kmetav1.TypeMeta `json:",inline"`
-	// +optional
-	kmetav1.ListMeta `json:"metadata"`
+	kmetav1.ListMeta `json:"metadata,omitempty"`
 	Items            []ExternalAttachment `json:"items"`
 }
 

api/vpc/v1beta1/externalattachment_types_test.go

@@ -94,7 +94,7 @@ func TestExternalAttachmentValidation(t *testing.T) {
 			},
 			Spec: v1beta1.ExternalSpec{
 				IPv4Namespace: "default",
-				L2: &v1beta1.ExternalL2Spec{
+				L2: &v1beta1.ExternalL2{
 					Prefixes: []string{"0.0.0.0/0"},
 				},
 			},

api/vpc/v1beta1/zz_generated.deepcopy.go

@@ -87,8 +87,6 @@ spec:
           status:
             description: Status is the observed state of the External
             type: object
-        required:
-        - spec
         type: object
     served: true
     storage: true

config/crd/bases/vpc.githedgehog.com_externals.yaml

@@ -935,7 +935,7 @@ _Appears in:_
 | `ip` _string_ | IP is the IP address of the subinterface on a switch port specified in the connection, it should include the prefix length |  |  |
 
 
-#### ExternalL2Spec
+#### ExternalL2
 
 
 
@@ -1083,7 +1083,7 @@ _Appears in:_
 | `ipv4Namespace` _string_ | IPv4Namespace is the name of the IPv4Namespace this External belongs to |  |  |
 | `inboundCommunity` _string_ | InboundCommunity is the inbound community to filter routes from the external system (e.g. 65102:5000) |  |  |
 | `outboundCommunity` _string_ | OutboundCommunity is theoutbound community that all outbound routes will be stamped with (e.g. 50000:50001) |  |  |
-| `l2` _[ExternalL2Spec](#externall2spec)_ | L2 contains L2 specific parameters |  |  |
+| `l2` _[ExternalL2](#externall2)_ | L2 contains L2 specific parameters |  |  |
 
 
 #### ExternalStatus