Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: update CRDs to accomodate multiple pod nics #2717

Merged
merged 3 commits into from
May 3, 2024
Merged

feat: update CRDs to accomodate multiple pod nics #2717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49791cb
feat: update CRDs to accomodate multiple pod nics
thatmattlong Apr 29, 2024
16043c9
fix: device type in mtpnc status, rename device types
thatmattlong May 2, 2024
c794a8d
fix: change podnetworks to podnetworkconfigs
thatmattlong May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions crd/multitenancy/api/v1alpha1/multitenantpodnetworkconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ import (
// +kubebuilder:printcolumn:name="PodNetworkInstance",type=string,JSONPath=`.spec.podNetworkInstance`
// +kubebuilder:printcolumn:name="PodNetwork",type=string,JSONPath=`.spec.podNetwork`
// +kubebuilder:printcolumn:name="PodName",type=string,JSONPath=`.spec.podName`
// +kubebuilder:printcolumn:name="NCID",type=string,JSONPath=`.status.ncID`
// +kubebuilder:printcolumn:name="PrimaryIP",type=string,JSONPath=`.status.primaryIP`
// +kubebuilder:printcolumn:name="MacAddress",type=string,JSONPath=`.status.macAddress`
// +kubebuilder:printcolumn:name="GatewayIP",type=string,JSONPath=`.status.gatewayIP`
type MultitenantPodNetworkConfig struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down Expand Up @@ -51,16 +47,34 @@ type MultitenantPodNetworkConfigSpec struct {
PodName string `json:"podName,omitempty"`
}

type InterfaceInfo struct {
// NCID is the network container id
NCID string `json:"ncID,omitempty"`
// PrimaryIP is the ip allocated to the network container
PrimaryIP string `json:"primaryIP,omitempty"`
// MacAddress is the MAC Address of the VM's NIC which this network container was created for
MacAddress string `json:"macAddress,omitempty"`
// GatewayIP is the gateway ip of the injected subnet
GatewayIP string `json:"gatewayIP,omitempty"`
thatmattlong marked this conversation as resolved.
Show resolved Hide resolved
}

// MultitenantPodNetworkConfigStatus defines the observed state of PodNetworkConfig
type MultitenantPodNetworkConfigStatus struct {
// network container id
// Deprecated - use InterfaceInfos
// +kubebuilder:validation:Optional
NCID string `json:"ncID,omitempty"`
Copy link
Contributor

@kmurudi kmurudi May 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these will be populated only for delegatedVMNIC (vnet nic & non-accelnet) if len(InterfaceInfos[]) is empty then only read

// ip allocated to the network container
// Deprecated - use InterfaceInfos
// +kubebuilder:validation:Optional
PrimaryIP string `json:"primaryIP,omitempty"`
// maps to the NIC to be injected for the network container
// Deprecated - use InterfaceInfos
// +kubebuilder:validation:Optional
MacAddress string `json:"macAddress,omitempty"`
// Gateway IP
// Deprecated - use InterfaceInfos
// +kubebuilder:validation:Optional
GatewayIP string `json:"gatewayIP,omitempty"`
// InterfaceInfos describes all of the network container goal state for this Pod
// +kubebuilder:validation:Optional
InterfaceInfos []InterfaceInfo `json:"interfaceInfos,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be populated then ignore higher fields in mtpncStatus

}

func init() {
Expand Down
23 changes: 20 additions & 3 deletions crd/multitenancy/api/v1alpha1/podnetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ import (
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Status",type=string,priority=1,JSONPath=`.status.status`
// +kubebuilder:printcolumn:name="Address Prefixes",type=string,priority=1,JSONPath=`.status.addressPrefixes`
// +kubebuilder:printcolumn:name="Network",type=string,priority=1,JSONPath=`.spec.vnetGUID`
// +kubebuilder:printcolumn:name="Network",type=string,priority=1,JSONPath=`.spec.networkID`
// +kubebuilder:printcolumn:name="Subnet",type=string,priority=1,JSONPath=`.spec.subnetResourceID`
// +kubebuilder:printcolumn:name="SubnetGUID",type=string,priority=1,JSONPath=`.spec.subnetGUID`
// +kubebuilder:printcolumn:name="DeviceType",type=string,priority=1,JSONPath=`.spec.subnetGUID`
type PodNetwork struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand All @@ -36,15 +37,31 @@ type PodNetworkList struct {
Items []PodNetwork `json:"items"`
}

// +kubebuilder:validation:Enum=acn.azure.com/vnet-nic;acn.azure.com/gpu-nic
type DeviceType string

const (
DeviceTypeVnetNIC DeviceType = "acn.azure.com/vnet-nic"
DeviceTypeGPUNIC DeviceType = "acn.azure.com/gpu-nic"
)

// PodNetworkSpec defines the desired state of PodNetwork
type PodNetworkSpec struct {
// NetworkID is the identifier for the network, e.g. vnet guid or IB network ID
// +kubebuilder:validation:Optional
// customer vnet guid
VnetGUID string `json:"vnetGUID,omitempty"`
NetworkID string `json:"networkID,omitempty"`
// DeviceType is the device type that is required by this network
// +kubebuilder:validation:Optional
DeviceType DeviceType `json:"deviceType,omitempty"`
thatmattlong marked this conversation as resolved.
Show resolved Hide resolved
// customer subnet id
// +kubebuilder:validation:Optional
SubnetResourceID string `json:"subnetResourceID,omitempty"`
// customer subnet guid
// +kubebuilder:validation:Optional
SubnetGUID string `json:"subnetGUID,omitempty"`
// Deprecated - Use NetworkID
// +kubebuilder:validation:Optional
VnetGUID string `json:"vnetGUID,omitempty"`
}

// Status indicates the status of PN
Expand Down
33 changes: 24 additions & 9 deletions crd/multitenancy/api/v1alpha1/podnetworkinstance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ import (
// +kubebuilder:subresource:status
// +kubebuilder:metadata:labels=managed=
// +kubebuilder:metadata:labels=owner=
// +kubebuilder:printcolumn:name="Pod IPs",type=string,priority=1,JSONPath=`.status.podIPAddresses`
// +kubebuilder:printcolumn:name="PodNetwork",type=string,priority=1,JSONPath=`.spec.podNetwork`
// +kubebuilder:printcolumn:name="PodIPReservationSize",type=string,priority=1,JSONPath=`.spec.podIPReservationSize`
// +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.status`
// +kubebuilder:printcolumn:name="PodNetworks",priority=1,type=string,JSONPath=`.spec.podNetworks`
type PodNetworkInstance struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand All @@ -36,19 +35,35 @@ type PodNetworkInstanceList struct {
Items []PodNetworkInstance `json:"items"`
}

// PodNetworkInstanceItem describes a template for how to attach a PodNetwork to a Pod
type PodNetworkInstanceItem struct {
// PodNetwork is the name of a PodNetwork resource
PodNetwork string `json:"podNetwork"`
// PodIPReservationSize is the number of IP address to statically reserve
// +kubebuilder:default=0
PodIPReservationSize int `json:"podIPReservationSize,omitempty"`
}

// PodNetworkInstanceSpec defines the desired state of PodNetworkInstance
type PodNetworkInstanceSpec struct {
// pod network resource object name
PodNetwork string `json:"podnetwork"`
// number of backend IP address to reserve for running pods
// Deprecated - use PodNetworks
// +kubebuilder:validation:Optional
PodNetwork string `json:"podnetwork,omitempty"`
// Deprecated - use PodNetworks
// +kubebuilder:default=0
PodIPReservationSize int `json:"podIPReservationSize"`
PodIPReservationSize int `json:"podIPReservationSize,omitempty"`
// PodNetworks describes each PodNetwork to attach to a single Pod
// optional for now in case orchestrator uses the deprecated fields
// +kubebuilder:validation:Optional
PodNetworks []PodNetworkInstanceItem `json:"podNetworks"`
thatmattlong marked this conversation as resolved.
Show resolved Hide resolved
}

// PodNetworkInstanceStatus defines the observed state of PodNetworkInstance
type PodNetworkInstanceStatus struct {
PodIPAddresses []string `json:"podIPAddresses,omitempty"`
Status PNIStatus `json:"status,omitempty"`
// +kubebuilder:validation:Optional
PodIPAddresses []string `json:"podIPAddresses,omitempty"`
Status PNIStatus `json:"status,omitempty"`
PodNetworkStatuses map[string]PNIStatus `json:"podNetworkStatuses,omitempty"`
}

// PNIStatus indicates the status of PNI
Expand Down
51 changes: 49 additions & 2 deletions crd/multitenancy/api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 24 additions & 16 deletions crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,6 @@ spec:
- jsonPath: .spec.podName
name: PodName
type: string
- jsonPath: .status.ncID
name: NCID
type: string
- jsonPath: .status.primaryIP
name: PrimaryIP
type: string
- jsonPath: .status.macAddress
name: MacAddress
type: string
- jsonPath: .status.gatewayIP
name: GatewayIP
type: string
name: v1alpha1
schema:
openAPIV3Schema:
Expand Down Expand Up @@ -80,16 +68,36 @@ spec:
of PodNetworkConfig
properties:
gatewayIP:
description: Gateway IP
description: Deprecated - use InterfaceInfos
type: string
interfaceInfos:
description: InterfaceInfos describes all of the network container
goal state for this Pod
items:
properties:
gatewayIP:
description: GatewayIP is the gateway ip of the injected subnet
type: string
macAddress:
description: MacAddress is the MAC Address of the VM's NIC which
this network container was created for
type: string
ncID:
description: NCID is the network container id
type: string
primaryIP:
description: PrimaryIP is the ip allocated to the network container
type: string
type: object
type: array
macAddress:
description: maps to the NIC to be injected for the network container
description: Deprecated - use InterfaceInfos
type: string
ncID:
description: network container id
description: Deprecated - use InterfaceInfos
type: string
primaryIP:
description: ip allocated to the network container
description: Deprecated - use InterfaceInfos
type: string
type: object
type: object
Expand Down
50 changes: 36 additions & 14 deletions crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,11 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.podIPAddresses
name: Pod IPs
priority: 1
type: string
- jsonPath: .spec.podNetwork
name: PodNetwork
priority: 1
- jsonPath: .status.status
name: Status
type: string
- jsonPath: .spec.podIPReservationSize
name: PodIPReservationSize
- jsonPath: .spec.podNetworks
name: PodNetworks
priority: 1
type: string
name: v1alpha1
Expand All @@ -55,14 +50,31 @@ spec:
properties:
podIPReservationSize:
default: 0
description: number of backend IP address to reserve for running pods
description: Deprecated - use PodNetworks
type: integer
podNetworks:
description: PodNetworks describes each PodNetwork to attach to a
single Pod optional for now in case orchestrator uses the deprecated
fields
items:
description: PodNetworkInstanceItem describes a template for how
to attach a PodNetwork to a Pod
properties:
podIPReservationSize:
default: 0
description: PodIPReservationSize is the number of IP address
to statically reserve
type: integer
podNetwork:
description: PodNetwork is the name of a PodNetwork resource
type: string
required:
- podNetwork
type: object
type: array
podnetwork:
description: pod network resource object name
description: Deprecated - use PodNetworks
type: string
required:
- podIPReservationSize
- podnetwork
type: object
status:
description: PodNetworkInstanceStatus defines the observed state of PodNetworkInstance
Expand All @@ -71,6 +83,16 @@ spec:
items:
type: string
type: array
podNetworkStatuses:
additionalProperties:
description: PNIStatus indicates the status of PNI
enum:
- Ready
- CreateReservationSetError
- PodNetworkNotReady
- InsufficientIPAddressesOnSubnet
thatmattlong marked this conversation as resolved.
Show resolved Hide resolved
type: string
type: object
status:
description: PNIStatus indicates the status of PNI
enum:
Expand Down
Loading
Loading