Support network interface attributes (#824)

ironcore-dev · Aug 15, 2023 · 5c892ce · 5c892ce
1 parent c9aab5f
commit 5c892ce
Show file tree

Hide file tree

Showing 21 changed files with 519 additions and 224 deletions.
diff --git a/api/networking/v1alpha1/networkinterface_types.go b/api/networking/v1alpha1/networkinterface_types.go
@@ -40,6 +40,8 @@ type NetworkInterfaceSpec struct {
 	Prefixes []PrefixSource `json:"prefixes,omitempty"`
 	// VirtualIP specifies the virtual ip that should be assigned to this NetworkInterface.
 	VirtualIP *VirtualIPSource `json:"virtualIP,omitempty"`
+	// Attributes are provider-specific attributes for the network interface.
+	Attributes map[string]string `json:"attributes,omitempty"`
 }
 
 // IPSource is the definition of how to obtain an IP.

diff --git a/api/networking/v1alpha1/zz_generated.deepcopy.go b/api/networking/v1alpha1/zz_generated.deepcopy.go
diff --git a/broker/machinebroker/server/machine.go b/broker/machinebroker/server/machine.go
@@ -163,9 +163,10 @@ func (s *Server) convertOnmetalNetworkInterfaceAttachment(
 		}
 
 		return &ori.NetworkInterface{
-			Name:      onmetalMachineNic.Name,
-			NetworkId: onmetalNic.Network.Spec.ProviderID,
-			Ips:       ips,
+			Name:       onmetalMachineNic.Name,
+			NetworkId:  onmetalNic.Network.Spec.ProviderID,
+			Ips:        ips,
+			Attributes: onmetalNic.NetworkInterface.Spec.Attributes,
 		}, nil
 	default:
 		return nil, fmt.Errorf("unrecognized onmetal machine network interface %#v", onmetalMachineNic)

diff --git a/broker/machinebroker/server/machine_networkinterface_attach.go b/broker/machinebroker/server/machine_networkinterface_attach.go
@@ -34,9 +34,10 @@ import (
 )
 
 type OnmetalNetworkInterfaceConfig struct {
-	Name      string
-	NetworkID string
-	IPs       []commonv1alpha1.IP
+	Name       string
+	NetworkID  string
+	IPs        []commonv1alpha1.IP
+	Attributes map[string]string
 }
 
 func (s *Server) getOnmetalNetworkInterfaceConfig(nic *ori.NetworkInterface) (*OnmetalNetworkInterfaceConfig, error) {
@@ -46,9 +47,10 @@ func (s *Server) getOnmetalNetworkInterfaceConfig(nic *ori.NetworkInterface) (*O
 	}
 
 	return &OnmetalNetworkInterfaceConfig{
-		Name:      nic.Name,
-		NetworkID: nic.NetworkId,
-		IPs:       ips,
+		Name:       nic.Name,
+		NetworkID:  nic.NetworkId,
+		IPs:        ips,
+		Attributes: nic.Attributes,
 	}, nil
 }
 
@@ -82,6 +84,7 @@ func (s *Server) createOnmetalNetworkInterface(
 			MachineRef: s.optionalLocalUIDReference(optOnmetalMachine),
 			IPFamilies: s.getOnmetalIPsIPFamilies(cfg.IPs),
 			IPs:        s.onmetalIPsToOnmetalIPSources(cfg.IPs),
+			Attributes: cfg.Attributes,
 		},
 	}
 	log.V(1).Info("Creating onmetal network interface")

diff --git a/client-go/applyconfigurations/internal/internal.go b/client-go/applyconfigurations/internal/internal.go
diff --git a/client-go/applyconfigurations/networking/v1alpha1/networkinterfacespec.go b/client-go/applyconfigurations/networking/v1alpha1/networkinterfacespec.go
diff --git a/client-go/openapi/zz_generated.openapi.go b/client-go/openapi/zz_generated.openapi.go
diff --git a/docs/api-reference/core.md b/docs/api-reference/core.md
@@ -126,6 +126,8 @@ ResourceQuotaStatus
 </thead>
 <tbody><tr><td><p>&#34;machine&#34;</p></td>
 <td></td>
+</tr><tr><td><p>&#34;volume&#34;</p></td>
+<td></td>
 </tr></tbody>
 </table>
 <h3 id="core.api.onmetal.de/v1alpha1.ObjectSelector">ObjectSelector

diff --git a/docs/api-reference/networking.md b/docs/api-reference/networking.md
@@ -635,6 +635,17 @@ VirtualIPSource
 <p>VirtualIP specifies the virtual ip that should be assigned to this NetworkInterface.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>attributes</code><br/>
+<em>
+map[string]string
+</em>
+</td>
+<td>
+<p>Attributes are provider-specific attributes for the network interface.</p>
+</td>
+</tr>
 </table>
 </td>
 </tr>
@@ -1586,6 +1597,17 @@ VirtualIPSource
 <p>VirtualIP specifies the virtual ip that should be assigned to this NetworkInterface.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>attributes</code><br/>
+<em>
+map[string]string
+</em>
+</td>
+<td>
+<p>Attributes are provider-specific attributes for the network interface.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="networking.api.onmetal.de/v1alpha1.NetworkInterfaceState">NetworkInterfaceState
@@ -1828,6 +1850,17 @@ VirtualIPSource
 <p>VirtualIP specifies the virtual ip that should be assigned to this NetworkInterface.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>attributes</code><br/>
+<em>
+map[string]string
+</em>
+</td>
+<td>
+<p>Attributes are provider-specific attributes for the network interface.</p>
+</td>
+</tr>
 </table>
 </td>
 </tr>

diff --git a/docs/api-reference/storage.md b/docs/api-reference/storage.md
@@ -1630,28 +1630,28 @@ VolumePoolState
 </tr>
 <tr>
 <td>
-<code>available</code><br/>
+<code>capacity</code><br/>
 <em>
 <a href="../core/#core.api.onmetal.de/v1alpha1.ResourceList">
 github.com/onmetal/onmetal-api/api/core/v1alpha1.ResourceList
 </a>
 </em>
 </td>
 <td>
-<p>Available list the available capacity of a VolumePool.</p>
+<p>Capacity represents the total resources of a machine pool.</p>
 </td>
 </tr>
 <tr>
 <td>
-<code>used</code><br/>
+<code>allocatable</code><br/>
 <em>
 <a href="../core/#core.api.onmetal.de/v1alpha1.ResourceList">
 github.com/onmetal/onmetal-api/api/core/v1alpha1.ResourceList
 </a>
 </em>
 </td>
 <td>
-<p>Used indicates how much capacity has been used in a VolumePool.</p>
+<p>Allocatable represents the resources of a machine pool that are available for scheduling.</p>
 </td>
 </tr>
 </tbody>

diff --git a/gen/swagger.json b/gen/swagger.json
@@ -87972,6 +87972,13 @@
 				"ips"
 			],
 			"properties": {
+				"attributes": {
+					"description": "Attributes are provider-specific attributes for the network interface.",
+					"type": "object",
+					"additionalProperties": {
+						"type": "string"
+					}
+				},
 				"ipFamilies": {
 					"description": "IPFamilies defines which IPFamilies this NetworkInterface is supporting",
 					"type": "array",
@@ -89241,8 +89248,8 @@
 			"description": "VolumePoolStatus defines the observed state of VolumePool",
 			"type": "object",
 			"properties": {
-				"available": {
-					"description": "Available list the available capacity of a VolumePool.",
+				"allocatable": {
+					"description": "Allocatable represents the resources of a machine pool that are available for scheduling.",
 					"type": "object",
 					"additionalProperties": {
 						"$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity"
@@ -89255,6 +89262,13 @@
 						"$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference"
 					}
 				},
+				"capacity": {
+					"description": "Capacity represents the total resources of a machine pool.",
+					"type": "object",
+					"additionalProperties": {
+						"$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity"
+					}
+				},
 				"conditions": {
 					"type": "array",
 					"items": {
@@ -89263,13 +89277,6 @@
 				},
 				"state": {
 					"type": "string"
-				},
-				"used": {
-					"description": "Used indicates how much capacity has been used in a VolumePool.",
-					"type": "object",
-					"additionalProperties": {
-						"$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity"
-					}
 				}
 			}
 		},

diff --git a/gen/v3/apis__compute.api.onmetal.de__v1alpha1_openapi.json b/gen/v3/apis__compute.api.onmetal.de__v1alpha1_openapi.json
@@ -5007,6 +5007,14 @@
 					"ips"
 				],
 				"properties": {
+					"attributes": {
+						"description": "Attributes are provider-specific attributes for the network interface.",
+						"type": "object",
+						"additionalProperties": {
+							"type": "string",
+							"default": ""
+						}
+					},
 					"ipFamilies": {
 						"description": "IPFamilies defines which IPFamilies this NetworkInterface is supporting",
 						"type": "array",

diff --git a/gen/v3/apis__networking.api.onmetal.de__v1alpha1_openapi.json b/gen/v3/apis__networking.api.onmetal.de__v1alpha1_openapi.json
@@ -11664,6 +11664,14 @@
 					"ips"
 				],
 				"properties": {
+					"attributes": {
+						"description": "Attributes are provider-specific attributes for the network interface.",
+						"type": "object",
+						"additionalProperties": {
+							"type": "string",
+							"default": ""
+						}
+					},
 					"ipFamilies": {
 						"description": "IPFamilies defines which IPFamilies this NetworkInterface is supporting",
 						"type": "array",

diff --git a/gen/v3/apis__storage.api.onmetal.de__v1alpha1_openapi.json b/gen/v3/apis__storage.api.onmetal.de__v1alpha1_openapi.json
@@ -8661,8 +8661,8 @@
 				"description": "VolumePoolStatus defines the observed state of VolumePool",
 				"type": "object",
 				"properties": {
-					"available": {
-						"description": "Available list the available capacity of a VolumePool.",
+					"allocatable": {
+						"description": "Allocatable represents the resources of a machine pool that are available for scheduling.",
 						"type": "object",
 						"additionalProperties": {
 							"default": {},
@@ -8685,31 +8685,31 @@
 							]
 						}
 					},
-					"conditions": {
-						"type": "array",
-						"items": {
+					"capacity": {
+						"description": "Capacity represents the total resources of a machine pool.",
+						"type": "object",
+						"additionalProperties": {
 							"default": {},
 							"allOf": [
 								{
-									"$ref": "#/components/schemas/com.github.onmetal.onmetal-api.api.storage.v1alpha1.VolumePoolCondition"
+									"$ref": "#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"
 								}
 							]
 						}
 					},
-					"state": {
-						"type": "string"
-					},
-					"used": {
-						"description": "Used indicates how much capacity has been used in a VolumePool.",
-						"type": "object",
-						"additionalProperties": {
+					"conditions": {
+						"type": "array",
+						"items": {
 							"default": {},
 							"allOf": [
 								{
-									"$ref": "#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"
+									"$ref": "#/components/schemas/com.github.onmetal.onmetal-api.api.storage.v1alpha1.VolumePoolCondition"
 								}
 							]
 						}
+					},
+					"state": {
+						"type": "string"
 					}
 				}
 			},

diff --git a/internal/apis/networking/networkinterface_types.go b/internal/apis/networking/networkinterface_types.go
@@ -40,6 +40,8 @@ type NetworkInterfaceSpec struct {
 	Prefixes []PrefixSource
 	// VirtualIP specifies the virtual ip that should be assigned to this NetworkInterface.
 	VirtualIP *VirtualIPSource
+	// Attributes are provider-specific attributes for the network interface.
+	Attributes map[string]string
 }
 
 // IPSource is the definition of how to obtain an IP.

diff --git a/internal/apis/networking/v1alpha1/zz_generated.conversion.go b/internal/apis/networking/v1alpha1/zz_generated.conversion.go