fixup! fixup! Network: gateway routes

Author: cheina97

apis/networking/v1alpha1/internalfabric_types.go

@@ -38,6 +38,8 @@ var InternalFabricGroupVersionResource = GroupVersion.WithResource(InternalFabri
 type InternalFabricSpecInterfaceNode struct {
 	// Name is the name of the interface added to the nodes.
 	Name string `json:"name"`
+	// IP is the IP of the interface added to the nodes.
+	IP IP `json:"ip"`
 }
 
 // InternalFabricSpecInterface contains the information about network interfaces.
@@ -59,6 +61,23 @@ type InternalFabricSpec struct {
 	GatewayIP IP `json:"gatewayIP"`
 }
 
+// InternalFabricStatusInterfaceNode contains the information about the node interface.
+type InternalFabricStatusInterfaceNode struct {
+	// Mac contains the MAC address of the node interface.
+	Mac string `json:"mac"`
+}
+
+// InternalFabricStatusInterface contains the information about the interface status.
+type InternalFabricStatusInterface struct {
+	// Node contains the information about the node interface.
+	Node InternalFabricStatusInterfaceNode `json:"node"`
+}
+
+// InternalFabricStatus defines the observed state of InternalFabric.
+type InternalFabricStatus struct {
+	Interface InternalFabricStatusInterface `json:"interface"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=liqo
 // +kubebuilder:printcolumn:name="Gateway IP",type=string,JSONPath=`.spec.gatewayIP`
@@ -71,7 +90,8 @@ type InternalFabric struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec InternalFabricSpec `json:"spec,omitempty"`
+	Spec   InternalFabricSpec   `json:"spec,omitempty"`
+	Status InternalFabricStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

apis/networking/v1alpha1/internalnode_types.go

@@ -38,6 +38,8 @@ var InternalNodeGroupVersionResource = GroupVersion.WithResource(InternalNodeRes
 type InternalNodeSpecInterfaceGateway struct {
 	// Name is the name of the interface added to the gateways.
 	Name string `json:"name"`
+	// IP is the IP of the interface added to the gateways.
+	IP IP `json:"ip"`
 }
 
 // InternalNodeSpecInterface contains the information about network interfaces.
@@ -62,10 +64,24 @@ type InternalNodeStatusNodeIP struct {
 	Remote *IP `json:"remote,omitempty"`
 }
 
+// InternalNodeStatusInterfaceGateway contains the information about the gateway interface.
+type InternalNodeStatusInterfaceGateway struct {
+	// Mac is the MAC address of the gateway interface.
+	Mac string `json:"mac"`
+}
+
+// InternalNodeStatusInterface contains the information about network interfaces.
+type InternalNodeStatusInterface struct {
+	// Gateway contains the information about the gateway interface.
+	Gateway InternalNodeStatusInterfaceGateway `json:"gateway"`
+}
+
 // InternalNodeStatus defines the observed state of InternalNode.
 type InternalNodeStatus struct {
 	// NodeAddress is the address of the node.
 	NodeIP InternalNodeStatusNodeIP `json:"nodeIP"`
+	// Interface contains the information about network interfaces.
+	Interface InternalNodeStatusInterface `json:"interface"`
 }
 
 // +kubebuilder:object:root=true

apis/networking/v1alpha1/zz_generated.deepcopy.go

@@ -57,11 +57,16 @@ spec:
                       The node interface is created on every node to connect them
                       to the gateway related with the internalfabric.
                     properties:
+                      ip:
+                        description: IP is the IP of the interface added to the nodes.
+                        pattern: ^(([1-9]{0,1}[0-9]{0,2}|2[0-4][0-9]|25[0-5])\.){3}([1-9]{0,1}[0-9]{0,2}|2[0-4][0-9]|25[0-5])$
+                        type: string
                       name:
                         description: Name is the name of the interface added to the
                           nodes.
                         type: string
                     required:
+                    - ip
                     - name
                     type: object
                 required:
@@ -82,6 +87,28 @@ spec:
             - gatewayIP
             - interface
             type: object
+          status:
+            description: InternalFabricStatus defines the observed state of InternalFabric.
+            properties:
+              interface:
+                description: InternalFabricStatusInterface contains the information
+                  about the interface status.
+                properties:
+                  node:
+                    description: Node contains the information about the node interface.
+                    properties:
+                      mac:
+                        description: Mac contains the MAC address of the node interface.
+                        type: string
+                    required:
+                    - mac
+                    type: object
+                required:
+                - node
+                type: object
+            required:
+            - interface
+            type: object
         type: object
     served: true
     storage: true

deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_internalfabrics.yaml

@@ -55,11 +55,16 @@ spec:
                       interface. The gateway interface is created on every gateway
                       to connect them to the node related with the internalnode.
                     properties:
+                      ip:
+                        description: IP is the IP of the interface added to the gateways.
+                        pattern: ^(([1-9]{0,1}[0-9]{0,2}|2[0-4][0-9]|25[0-5])\.){3}([1-9]{0,1}[0-9]{0,2}|2[0-4][0-9]|25[0-5])$
+                        type: string
                       name:
                         description: Name is the name of the interface added to the
                           gateways.
                         type: string
                     required:
+                    - ip
                     - name
                     type: object
                 required:
@@ -71,6 +76,22 @@ spec:
           status:
             description: InternalNodeStatus defines the observed state of InternalNode.
             properties:
+              interface:
+                description: Interface contains the information about network interfaces.
+                properties:
+                  gateway:
+                    description: Gateway contains the information about the gateway
+                      interface.
+                    properties:
+                      mac:
+                        description: Mac is the MAC address of the gateway interface.
+                        type: string
+                    required:
+                    - mac
+                    type: object
+                required:
+                - gateway
+                type: object
               nodeIP:
                 description: NodeAddress is the address of the node.
                 properties:
@@ -86,6 +107,7 @@ spec:
                     type: string
                 type: object
             required:
+            - interface
             - nodeIP
             type: object
         type: object

deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_internalnodes.yaml

@@ -43,7 +43,7 @@ spec:
           command: ["/usr/bin/liqo-fabric"]
           args:
           - --nodename=$(NODE_NAME)
-          - --enable-arp=false
+          - --enable-arp=true
           {{- if .Values.common.extraArgs }}
           {{- toYaml .Values.common.extraArgs | nindent 10 }}
           {{- end }}

deployments/liqo/templates/liqo-fabric-daemonset.yaml

@@ -89,7 +89,7 @@ spec:
                 - --mode=server
                 - --metrics-address=:8084
                 - --health-probe-bind-address=:8085
-                - --enable-arp=false
+                - --enable-arp=true
                 env:
                 - name: NODE_NAME
                   valueFrom:

deployments/liqo/templates/liqo-wireguard-gateway-client-template.yaml

@@ -102,7 +102,7 @@ spec:
                 - --mode=server
                 - --metrics-address=:8084
                 - --health-probe-bind-address=:8085
-                - --enable-arp=false
+                - --enable-arp=true
                 env:
                 - name: NODE_NAME
                   valueFrom: