Update mellanox dpdk example files

k8snetworkplumbingwg · May 12, 2020 · 96cf184 · BurlyLuo · Jun 12, 2022 · adrianchiris
1 parent 6a451ad
commit 96cf184
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/docs/dpdk/mlnx-dpdk/configMap.yaml b/docs/dpdk/mlnx-dpdk/configMap.yaml
@@ -8,20 +8,22 @@ data:
     {
         "resourceList": [
             {
+                "resourcePrefix": "mellanox.com",
                 "resourceName": "mlnx_connectx4",
                 "selectors": {
                     "vendors": ["15b3"],
                     "devices": ["1016"],
-                    "drivers": ["mlx5_ib", "mlx5_core"],
+                    "drivers": ["mlx5_core"],
                     "isRdma": true
                 }
             },
             {
+                "resourcePrefix": "mellanox.com",
                 "resourceName": "mlnx_connectx5",
                 "selectors": {
                     "vendors": ["15b3"],
                     "devices": ["1018"],
-                    "drivers": ["mlx5_ib", "mlx5_core"],
+                    "drivers": ["mlx5_core"],
                     "isRdma": true
                 }
             }

diff --git a/docs/dpdk/mlnx-dpdk/crd-dpdk-connectx4.yaml b/docs/dpdk/mlnx-dpdk/crd-dpdk-connectx4.yaml
@@ -6,6 +6,15 @@ metadata:
     k8s.v1.cni.cncf.io/resourceName: mellanox.com/mlnx_connectx4
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "sriov",
-    "name": "sriov-mlnx_connectx4"
+    "name": "sriov-mlnx-connectx4",
+    "ipam": {
+      "type": "host-local",
+      "subnet": "10.56.217.0/24",
+      "routes": [{
+        "dst": "0.0.0.0/0"
+      }],
+      "gateway": "10.56.217.1"
+    }
 }'
diff --git a/docs/dpdk/mlnx-dpdk/crd-dpdk-connectx5.yaml b/docs/dpdk/mlnx-dpdk/crd-dpdk-connectx5.yaml
@@ -6,6 +6,15 @@ metadata:
     k8s.v1.cni.cncf.io/resourceName: mellanox.com/mlnx_connectx5
 spec:
   config: '{
+    "cniVersion": "0.3.1",
     "type": "sriov",
-    "name": "sriov-mlnx_connectx5"
+    "name": "sriov-mlnx-connectx5",
+    "ipam": {
+      "type": "host-local",
+      "subnet": "10.56.217.0/24",
+      "routes": [{
+        "dst": "0.0.0.0/0"
+      }],
+      "gateway": "10.56.217.1"
+    }
 }'
diff --git a/docs/dpdk/mlnx-dpdk/mlnx-pod_testpmd_connectx4.yaml b/docs/dpdk/mlnx-dpdk/mlnx-pod_testpmd_connectx4.yaml
@@ -8,7 +8,7 @@ spec:
   containers:
   - name: testpmd
     image: <DPDK testpmd image>
-    imagePullPolicy: Never
+    imagePullPolicy: IfNotPresent
     securityContext:
      capabilities:
         add: ["IPC_LOCK"]
@@ -18,10 +18,10 @@ spec:
     resources:
       requests:
         memory: 1Gi
-        hugepages-1Gi: 4Gi
+        hugepages-1Gi: 2Gi
         mellanox.com/mlnx_connectx4: 2
       limits:
-        hugepages-1Gi: 4Gi
+        hugepages-1Gi: 2Gi
         mellanox.com/mlnx_connectx4: 2
     command: ["sleep", "infinity"]
   volumes:

diff --git a/docs/dpdk/mlnx-dpdk/mlnx-pod_testpmd_connectx5.yaml b/docs/dpdk/mlnx-dpdk/mlnx-pod_testpmd_connectx5.yaml
@@ -8,7 +8,7 @@ spec:
   containers:
   - name: testpmd
     image: <DPDK testpmd image>
-    imagePullPolicy: Never
+    imagePullPolicy: IfNotPresent
     securityContext:
      capabilities:
         add: ["IPC_LOCK"]
@@ -18,10 +18,10 @@ spec:
     resources:
       requests:
         memory: 1Gi
-        hugepages-1Gi: 4Gi
+        hugepages-1Gi: 2Gi
         mellanox.com/mlnx_connectx5: 2
       limits:
-        hugepages-1Gi: 4Gi
+        hugepages-1Gi: 2Gi
         mellanox.com/mlnx_connectx5: 2
     command: ["sleep", "infinity"]
   volumes:

diff --git a/docs/rdma/configMap.yaml b/docs/rdma/configMap.yaml
@@ -9,10 +9,11 @@ data:
         "resourceList": [
             {
                 "resourceName": "mlnx_rdma",
+                "resourcePrefix": "mellanox.com",
                 "selectors": {
                     "vendors": ["15b3"],
                     "devices": ["1016", "1018"],
-                    "drivers": ["mlx5_ib", "mlx5_core"],
+                    "drivers": ["mlx5_core"],
                     "isRdma": true
                 }
             }