IPoIB Network support

api/v1alpha1/ipoibnetwork_types.go

@@ -0,0 +1,76 @@
+/*
+2022 NVIDIA CORPORATION & AFFILIATES
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	IPoIBNetworkCRDName = "IPoIBNetwork"
+)
+
+// IPoIBNetworkSpec defines the desired state of IPoIBNetwork
+type IPoIBNetworkSpec struct {
+	// Namespace of the NetworkAttachmentDefinition custom resource
+	NetworkNamespace string `json:"networkNamespace,omitempty"`
+	// Name of the host interface to enslave. Defaults to default route interface
+	Master string `json:"master,omitempty"`
+	// IPAM configuration to be used for this network.
+	IPAM string `json:"ipam,omitempty"`
+}
+
+// IPoIBNetworkStatus defines the observed state of IPoIBNetwork
+type IPoIBNetworkStatus struct {
+	// Reflects the state of the IPoIBNetwork
+	// +kubebuilder:validation:Enum={"notReady", "ready", "error"}
+	State State `json:"state"`
+	// Network attachment definition generated from IPoIBNetworkSpec
+	IPoIBNetworkAttachmentDef string `json:"ipoibNetworkAttachmentDef,omitempty"`
+	// Informative string in case the observed state is error
+	Reason string `json:"reason,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:object:generate=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.state`,priority=0
+// +kubebuilder:printcolumn:name="Age",type=string,JSONPath=`.metadata.creationTimestamp`,priority=0
+
+// IPoIBNetwork is the Schema for the ipoibnetworks API
+type IPoIBNetwork struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   IPoIBNetworkSpec   `json:"spec,omitempty"`
+	Status IPoIBNetworkStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:object:generate=true
+
+// IPoIBNetworkList contains a list of IPoIBNetwork
+type IPoIBNetworkList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []IPoIBNetwork `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&IPoIBNetwork{}, &IPoIBNetworkList{})
+}

api/v1alpha1/nicclusterpolicy_types.go

@@ -100,6 +100,8 @@ type SecondaryNetworkSpec struct {
 	Multus *MultusSpec `json:"multus,omitempty"`
 	// Image information for CNI plugins
 	CniPlugins *ImageSpec `json:"cniPlugins,omitempty"`
+	// Image information for IPoIB CNI
+	IPoIB *ImageSpec `json:"ipoib,omitempty"`
 	// Image information for IPAM plugin
 	IpamPlugin *ImageSpec `json:"ipamPlugin,omitempty"`
 }

config/crd/bases/mellanox.com_ipoibnetworks.yaml

@@ -0,0 +1,86 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: ipoibnetworks.mellanox.com
+spec:
+  group: mellanox.com
+  names:
+    kind: IPoIBNetwork
+    listKind: IPoIBNetworkList
+    plural: ipoibnetworks
+    singular: ipoibnetwork
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: IPoIBNetwork is the Schema for the ipoibnetworks API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: IPoIBNetworkSpec defines the desired state of IPoIBNetwork
+            properties:
+              ipam:
+                description: IPAM configuration to be used for this network.
+                type: string
+              master:
+                description: Name of the host interface to enslave. Defaults to default
+                  route interface
+                type: string
+              networkNamespace:
+                description: Namespace of the NetworkAttachmentDefinition custom resource
+                type: string
+            type: object
+          status:
+            description: IPoIBNetworkStatus defines the observed state of IPoIBNetwork
+            properties:
+              ipoibNetworkAttachmentDef:
+                description: Network attachment definition generated from IPoIBNetworkSpec
+                type: string
+              reason:
+                description: Informative string in case the observed state is error
+                type: string
+              state:
+                description: Reflects the state of the IPoIBNetwork
+                enum:
+                - notReady
+                - ready
+                - error
+                type: string
+            required:
+            - state
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/mellanox.com_nicclusterpolicies.yaml

@@ -445,6 +445,27 @@ spec:
                     - repository
                     - version
                     type: object
+                  ipoib:
+                    description: Image information for IPoIB CNI
+                    properties:
+                      image:
+                        pattern: '[a-zA-Z0-9\-]+'
+                        type: string
+                      imagePullSecrets:
+                        items:
+                          type: string
+                        type: array
+                      repository:
+                        pattern: '[a-zA-Z0-9\.\-\/]+'
+                        type: string
+                      version:
+                        pattern: '[a-zA-Z0-9\.-]+'
+                        type: string
+                    required:
+                    - image
+                    - repository
+                    - version
+                    type: object
                   multus:
                     description: Image and configuration information for multus
                     properties:

config/crd/kustomization.yaml

@@ -5,6 +5,7 @@ resources:
 - bases/mellanox.com_macvlannetworks.yaml
 - bases/mellanox.com_nicclusterpolicies.yaml
 - bases/mellanox.com_hostdevicenetworks.yaml
+- bases/mellanox.com_ipoibnetworks.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

config/manifests/bases/nvidia-network-operator.clusterserviceversion.yaml

@@ -21,6 +21,9 @@ spec:
     - kind: MacvlanNetwork
       name: macvlannetworks.mellanox.com
       version: v1alpha1
+    - kind: IPoIBNetwork
+      name: ipoibnetworks.mellanox.com
+      version: v1alpha1
     - kind: NetworkAttachmentDefinition
       name: network-attachment-definitions.k8s.cni.cncf.io
       version: v1

config/rbac/role.yaml

@@ -158,6 +158,26 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - mellanox.com
+  resources:
+  - ipoibnetworks
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - mellanox.com
+  resources:
+  - ipoibnetworks/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - mellanox.com
   resources:

config/samples/kustomization.yaml

@@ -3,4 +3,5 @@ resources:
 - mellanox.com_v1alpha1_macvlannetwork.yaml
 - mellanox.com_v1alpha1_nicclusterpolicy.yaml
 - mellanox.com_v1alpha1_hostdevicenetwork.yaml
+- mellanox.com_v1alpha1_ipoibnetwork.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples

config/samples/mellanox.com_v1alpha1_ipoibnetwork.yaml

@@ -0,0 +1,29 @@
+# 2022 NVIDIA CORPORATION & AFFILIATES
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: mellanox.com/v1alpha1
+kind: IPoIBNetwork
+metadata:
+  name: example-ipoibnetwork
+spec:
+  networkNamespace: "default"
+  master: "ibs3f1"
+  ipam: |
+    {
+      "type": "whereabouts",
+      "range": "192.168.6.225/28",
+      "exclude": [
+       "192.168.6.229/30",
+       "192.168.6.236/32"
+      ]
+    }