diff --git a/api/machine.go b/api/machine.go index 28ed6ec..dfbcc7c 100644 --- a/api/machine.go +++ b/api/machine.go @@ -101,25 +101,37 @@ const ( ) type NetworkInterfaceSpec struct { - Name string `json:"name"` - NetworkId string `json:"networkId"` - Ips []string `json:"ips"` - Attributes map[string]string `json:"attributes"` - DeletedAt *time.Time `json:"deletedAt,omitempty"` + Metadata *NetworkInterfaceMetadata `json:"metadata,omitempty"` + Name string `json:"name"` + NetworkId string `json:"networkId"` + Ips []string `json:"ips"` + Attributes map[string]string `json:"attributes"` + DeletedAt *time.Time `json:"deletedAt,omitempty"` +} + +type NetworkInterfaceMetadata struct { + ID string `json:"id,omitempty"` + Name string `json:"name,omitempty"` + Namespace string `json:"namespace,omitempty"` } type NetworkInterfaceStatus struct { - Name string `json:"name"` - Handle string `json:"handle"` - State NetworkInterfaceState `json:"state"` - Type NetworkInterfaceType `json:"type,omitempty"` - Path string `json:"path,omitempty"` + Name string `json:"name"` + Handle string `json:"handle"` + State NetworkInterfaceState `json:"state"` + Type NetworkInterfaceType `json:"type,omitempty"` + Path string `json:"path,omitempty"` + Ips []string `json:"ips,omitempty"` + Prefixes []string `json:"prefixes,omitempty"` + VirtualIP string `json:"virtualIP,omitempty"` } type NetworkInterfaceState string const ( NetworkInterfaceStatePending NetworkInterfaceState = "Pending" + NetworkInterfaceStateReady NetworkInterfaceState = "Ready" + NetworkInterfaceStateError NetworkInterfaceState = "Error" NetworkInterfaceStatePrepared NetworkInterfaceState = "Prepared" NetworkInterfaceStateAttached NetworkInterfaceState = "Attached" ) diff --git a/go.mod b/go.mod index b14b989..7ba3975 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-logr/logr v1.4.4 github.com/google/uuid v1.6.0 github.com/ironcore-dev/controller-utils v0.15.0 - github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904 + github.com/ironcore-dev/ironcore v0.8.1-0.20261005140517-6ec7ff227ec3 github.com/ironcore-dev/ironcore-image v0.5.0 github.com/ironcore-dev/ironcore-net v0.6.0 github.com/ironcore-dev/provider-utils v0.0.0-20261023075413-1d4246454a50 diff --git a/go.sum b/go.sum index 20a8410..c746928 100644 --- a/go.sum +++ b/go.sum @@ -131,8 +131,8 @@ github.com/ironcore-dev/brokers v0.0.0-20260928082849-628cc25fd8ca h1:fLdDpNuymi github.com/ironcore-dev/brokers v0.0.0-20260928082849-628cc25fd8ca/go.mod h1:2RWGtX3C0UaYqah5SgglJH2fM9oUu1njzY5oXneVWoI= github.com/ironcore-dev/controller-utils v0.15.0 h1:K8vMOeY8rMyZcoL67hGvOZxxPb7rlrR6yS5VvcP6Xig= github.com/ironcore-dev/controller-utils v0.15.0/go.mod h1:E/3nSv9TxRtSGpejWMwLTxbb9fknTcPhcA8moHXa0sY= -github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904 h1:/EDdIi+hDurZy1zJCNprTWaqZQDAg4mo5wW7s78PXUk= -github.com/ironcore-dev/ironcore v0.8.1-0.20260924093634-7346f4f9b904/go.mod h1:LkAjBGMMwMgomdJK1MqwRyK1IWjMraIZ4NmUxWL24F4= +github.com/ironcore-dev/ironcore v0.8.1-0.20261005140517-6ec7ff227ec3 h1:yNMKZ/ZSS9q7FV2KD0ZATIygUMbYTXypGb6t5Fq6juY= +github.com/ironcore-dev/ironcore v0.8.1-0.20261005140517-6ec7ff227ec3/go.mod h1:X0QNN3CcgLwB+nL7w+C+zaCI/l09BKIQELjbZdEa8/s= github.com/ironcore-dev/ironcore-image v0.5.0 h1:L4ZLIV5WhOFk4Bp+PtBXut6nYXsCRAoyEiZe+CknPOg= github.com/ironcore-dev/ironcore-image v0.5.0/go.mod h1:seDdoS2K31VpL4LlKC9apbLs2fbGrHZEsPBR3dBYMs0= github.com/ironcore-dev/ironcore-net v0.6.0 h1:0O81zKDqxUrXkJX2o2ne49bE2PwRRe4C+isShk7ZKuM= diff --git a/internal/plugins/networkinterface/apinet/apinet.go b/internal/plugins/networkinterface/apinet/apinet.go index 5745cc4..373fd5a 100644 --- a/internal/plugins/networkinterface/apinet/apinet.go +++ b/internal/plugins/networkinterface/apinet/apinet.go @@ -170,9 +170,12 @@ func (p *Plugin) Apply( apinetNic.Spec.NodeRef.Name, apinetNic.UID, ), - State: api.NetworkInterfaceStatePrepared, - Type: deviceType, - Path: path, + State: api.NetworkInterfaceStatePrepared, + Type: deviceType, + Path: path, + Ips: toString(apinetNic.Spec.IPs), + Prefixes: toString(apinetNic.Status.Prefixes), + VirtualIP: virtualIP(apinetNic), }, nil } @@ -211,9 +214,12 @@ func (p *Plugin) Apply( apinetNic.Spec.NodeRef.Name, apinetNic.UID, ), - State: api.NetworkInterfaceStatePrepared, - Type: deviceType, - Path: path, + State: api.NetworkInterfaceStatePrepared, + Type: deviceType, + Path: path, + Ips: toString(apinetNic.Spec.IPs), + Prefixes: toString(apinetNic.Status.Prefixes), + VirtualIP: virtualIP(apinetNic), }, nil } @@ -223,6 +229,21 @@ func (p *Plugin) Apply( }, nil } +func toString[S fmt.Stringer](ss []S) []string { + ret := make([]string, len(ss)) + for i, s := range ss { + ret[i] = s.String() + } + return ret +} + +func virtualIP(nic *apinetv1alpha1.NetworkInterface) string { + if len(nic.Status.PublicIPs) == 0 { + return "" + } + return nic.Status.PublicIPs[0].String() +} + func getDeviceInfo(status *apinetv1alpha1.NetworkInterfaceStatus) (string, api.NetworkInterfaceType, error) { if status.PCIAddress != nil { pciDevice := status.PCIAddress diff --git a/internal/server/machine.go b/internal/server/machine.go index 3c11b87..b3e6f91 100644 --- a/internal/server/machine.go +++ b/internal/server/machine.go @@ -8,6 +8,7 @@ import ( "github.com/ironcore-dev/cloud-hypervisor-provider/api" iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1" + irimeta "github.com/ironcore-dev/ironcore/iri/apis/meta/v1alpha1" "k8s.io/utils/ptr" ) @@ -104,6 +105,7 @@ func (s *Server) getIRINICSpec(machine *api.Machine) []*iri.NetworkInterface { NetworkId: nic.NetworkId, Ips: nic.Ips, Attributes: nic.Attributes, + Metadata: getIRINetworkInterfaceMetadata(nic.Metadata), }) } @@ -137,9 +139,12 @@ func (s *Server) getIRINICStatus(machine *api.Machine) ([]*iri.NetworkInterfaceS } nics = append(nics, &iri.NetworkInterfaceStatus{ - Name: nic.Name, - Handle: nic.Handle, - State: state, + Name: nic.Name, + Handle: nic.Handle, + State: state, + Ips: nic.Ips, + Prefixes: nic.Prefixes, + VirtualIp: nic.VirtualIP, }) } @@ -176,9 +181,13 @@ func (s *Server) getIRINICState(state api.NetworkInterfaceState) (iri.NetworkInt case api.NetworkInterfaceStateAttached: return iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED, nil case api.NetworkInterfaceStatePrepared: - fallthrough + return iri.NetworkInterfaceState_NETWORK_INTERFACE_READY, nil + case api.NetworkInterfaceStateReady: + return iri.NetworkInterfaceState_NETWORK_INTERFACE_READY, nil case api.NetworkInterfaceStatePending: return iri.NetworkInterfaceState_NETWORK_INTERFACE_PENDING, nil + case api.NetworkInterfaceStateError: + return iri.NetworkInterfaceState_NETWORK_INTERFACE_ERROR, nil default: return 0, fmt.Errorf("unknown network interface state '%q'", state) } @@ -278,9 +287,34 @@ func (s *Server) getNICFromIRINIC(iriNIC *iri.NetworkInterface) (*api.NetworkInt } return &api.NetworkInterfaceSpec{ + Metadata: getNetworkInterfaceMetadata(iriNIC.Metadata), Name: iriNIC.Name, NetworkId: iriNIC.NetworkId, Ips: iriNIC.Ips, Attributes: iriNIC.Attributes, }, nil } + +func getIRINetworkInterfaceMetadata(metadata *api.NetworkInterfaceMetadata) *irimeta.ObjectMetadata { + if metadata == nil { + return nil + } + + return &irimeta.ObjectMetadata{ + Id: metadata.ID, + Name: metadata.Name, + Namespace: metadata.Namespace, + } +} + +func getNetworkInterfaceMetadata(metadata *irimeta.ObjectMetadata) *api.NetworkInterfaceMetadata { + if metadata == nil { + return nil + } + + return &api.NetworkInterfaceMetadata{ + ID: metadata.Id, + Name: metadata.Name, + Namespace: metadata.Namespace, + } +} diff --git a/internal/server/machine_create.go b/internal/server/machine_create.go index c0516e2..71ba423 100644 --- a/internal/server/machine_create.go +++ b/internal/server/machine_create.go @@ -52,12 +52,11 @@ func (s *Server) createMachineFromIRIMachine( var networkInterfaces []*api.NetworkInterfaceSpec for _, iriNetworkInterface := range iriMachine.Spec.NetworkInterfaces { - networkInterfaceSpec := &api.NetworkInterfaceSpec{ - Name: iriNetworkInterface.Name, - NetworkId: iriNetworkInterface.NetworkId, - Ips: iriNetworkInterface.Ips, - Attributes: iriNetworkInterface.Attributes, + networkInterfaceSpec, err := s.getNICFromIRINIC(iriNetworkInterface) + if err != nil { + return nil, fmt.Errorf("error converting network interface: %w", err) } + networkInterfaces = append(networkInterfaces, networkInterfaceSpec) } diff --git a/internal/server/machine_networkinterface_attach_test.go b/internal/server/machine_networkinterface_attach_test.go index 2c557b6..4fb6d60 100644 --- a/internal/server/machine_networkinterface_attach_test.go +++ b/internal/server/machine_networkinterface_attach_test.go @@ -38,6 +38,11 @@ var _ = Describe("AttachNetworkInterface", func() { Name: "my-nic", NetworkId: "network-id", Ips: []string{"10.0.0.1"}, + Metadata: &irimeta.ObjectMetadata{ + Id: "nic-uid-1", + Name: "nic-name-1", + Namespace: "nic-namespace-1", + }, }, })).Error().NotTo(HaveOccurred()) @@ -49,5 +54,10 @@ var _ = Describe("AttachNetworkInterface", func() { Expect(err).NotTo(HaveOccurred()) Expect(updatedMachine.Machines).To(HaveLen(1)) Expect(updatedMachine.Machines[0].Spec.NetworkInterfaces).To(HaveLen(1)) + Expect(updatedMachine.Machines[0].Spec.NetworkInterfaces[0].Metadata).To(Equal(&irimeta.ObjectMetadata{ + Id: "nic-uid-1", + Name: "nic-name-1", + Namespace: "nic-namespace-1", + })) }) })