Merge pull request #603 from e0ne/sync-chart

Sync SR-IOV Network Operator Helm chart
Mellanox · Sep 26, 2023 · 0183193 · 0183193
2 parents a4e1974 + fa18293
commit 0183193
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 9 deletions.
diff --git a/deployment/network-operator/charts/sriov-network-operator/README.md b/deployment/network-operator/charts/sriov-network-operator/README.md
@@ -46,6 +46,11 @@ $ helm install -n sriov-network-operator --create-namespace --wait sriov-network
 $ kubectl -n sriov-network-operator get pods
 ```
 
+In the case that [Pod Security Admission](https://kubernetes.io/docs/concepts/security/pod-security-admission/) is enabled, the sriov network operator namespace will require a security level of 'privileged'
+```
+$ kubectl label ns sriov-network-operator pod-security.kubernetes.io/enforce=privileged
+```
+
 ## Chart parameters
 
 In order to tailor the deployment of the network operator to your cluster needs

diff --git a/...harts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml b/...harts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
@@ -49,6 +49,10 @@ spec:
                 - legacy
                 - switchdev
                 type: string
+              excludeTopology:
+                description: Exclude device's NUMA node when advertising this resource
+                  by SRIOV network device plugin. Default to false.
+                type: boolean
               isRdma:
                 description: RDMA mode. Defaults to false.
                 type: boolean
@@ -112,6 +116,12 @@ spec:
               resourceName:
                 description: SRIOV Network device plugin endpoint resource name
                 type: string
+              vdpaType:
+                description: VDPA device type. Allowed value "virtio", "vhost"
+                enum:
+                - virtio
+                - vhost
+                type: string
             required:
             - nicSelector
             - nodeSelector

diff --git a/.../charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/.../charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
@@ -15,7 +15,14 @@ spec:
     singular: sriovnetworknodestate
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.syncStatus
+      name: Sync Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         description: SriovNetworkNodeState is the Schema for the sriovnetworknodestates
@@ -66,6 +73,8 @@ spec:
                             type: string
                           resourceName:
                             type: string
+                          vdpaType:
+                            type: string
                           vfRange:
                             type: string
                         type: object

diff --git a/...or/charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml b/...or/charts/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml
@@ -41,6 +41,14 @@ spec:
                   type: string
                 description: NodeSelector selects the nodes to be configured
                 type: object
+              configurationMode:
+                description: 'Flag to enable the sriov-network-config-daemon to use
+                  a systemd service to configure SR-IOV devices on boot Default mode:
+                  daemon'
+                enum:
+                - daemon
+                - systemd
+                type: string
               disableDrain:
                 description: Flag to disable nodes drain during debugging
                 type: boolean
@@ -66,7 +74,7 @@ spec:
                 type: integer
               maxParallelNodeConfiguration:
                 default: 1
-                description: how many nodes can be configured in parallel 0 means
+                description: How many nodes can be configured in parallel 0 means
                   no limit, all nodes will be configured in parallel
                 minimum: 0
                 type: integer

diff --git a/deployment/network-operator/charts/sriov-network-operator/templates/clusterrole.yaml b/deployment/network-operator/charts/sriov-network-operator/templates/clusterrole.yaml
@@ -55,3 +55,6 @@ rules:
   - apiGroups: [""]
     resources: ["pods/eviction"]
     verbs: ["create"]
+  - apiGroups: [ "config.openshift.io" ]
+    resources: [ "infrastructures" ]
+    verbs: [ "get", "list", "watch" ]
diff --git a/deployment/network-operator/charts/sriov-network-operator/templates/configmap.yaml b/deployment/network-operator/charts/sriov-network-operator/templates/configmap.yaml
@@ -6,7 +6,10 @@ data:
   Intel_i40e_XXV710: "8086 158a 154c"
   Intel_i40e_25G_SFP28: "8086 158b 154c"
   Intel_i40e_10G_X710_SFP: "8086 1572 154c"
+  Intel_ixgbe_10G_X550: "8086 1563 1565"
   Intel_i40e_X710_X557_AT_10G: "8086 1589 154c"
+  Intel_i40e_10G_X710_BACKPLANE: "8086 1581 154c"
+  Intel_i40e_10G_X710_BASE_T: "8086 15ff 154c"
   Intel_i40e_XXV710_N3000: "8086 0d58 154c"
   Intel_i40e_40G_XL710_QSFP: "8086 1583 154c"
   Intel_ice_Columbiaville_E810-CQDA2_2CQDA2: "8086 1592 1889"
@@ -22,7 +25,13 @@ data:
   Nvidia_mlx5_ConnectX-6_Lx: "15b3 101f 101e"
   Nvidia_mlx5_ConnectX-7: "15b3 1021 101e"
   Nvidia_mlx5_MT42822_BlueField-2_integrated_ConnectX-6_Dx: "15b3 a2d6 101e"
+  Nvidia_mlx5_MT43244_BlueField-3_integrated_ConnectX-7_Dx: "15b3 a2dc 101e"
   Broadcom_bnxt_BCM57414_2x25G: "14e4 16d7 16dc"
   Broadcom_bnxt_BCM75508_2x100G: "14e4 1750 1806"
   Qlogic_qede_QL45000_50G: "1077 1654 1664"
   Red_Hat_Virtio_network_device: "1af4 1000 1000"
+  Marvell_OCTEON_TX2_CN96XX: "177d b200 b203"
+  Marvell_OCTEON_TX2_CN98XX: "177d b100 b103"
+  Marvell_OCTEON_Fusion_CNF95XX: "177d b600 b603"
+  Marvell_OCTEON10_CN10XXX: "177d b900 b903"
+  Marvell_OCTEON_Fusion_CNF105XX: "177d ba00 ba03"
diff --git a/deployment/network-operator/charts/sriov-network-operator/values.yaml b/deployment/network-operator/charts/sriov-network-operator/values.yaml
@@ -9,13 +9,16 @@ operator:
   nodeSelector: {}
   affinity:
     nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-            - key: "node-role.kubernetes.io/master"
-              operator: In
-              values: [ "" ]
-          - matchExpressions:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 1
+          preference:
+            matchExpressions:
+              - key: "node-role.kubernetes.io/master"
+                operator: In
+                values: [""]
+        - weight: 1
+          preference:
+            matchExpressions:
               - key: "node-role.kubernetes.io/control-plane"
                 operator: In
                 values: [ "" ]