dra-evolution: migrate pod-multi-net-*.yaml to relevant types

Signed-off-by: Kevin Klues <kklues@nvidia.com>

Author: klueska

dra-evolution/testdata/pod-multi-net-0.yaml

@@ -1,6 +1,6 @@
 # A Pod with one secondary SR-IOV VF interface.
 #
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha2
 kind: Pod
 metadata:
   name: my-pod
@@ -13,7 +13,8 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    devices:
-    - name: netdev0 # not used, but required
-      class: example.com-sriov-vf
+  resourceClaims:
+  - name: netdev0
+    source:
+      forClass:
+        className: example.com-sriov-vf

dra-evolution/testdata/pod-multi-net-1.yaml

@@ -1,7 +1,7 @@
 # A Pod with two secondary SR-IOV VF interfaces, and one
 # secondary SR-IOV PF interface.
 #
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha1
 kind: Pod
 metadata:
   name: my-pod
@@ -15,10 +15,15 @@ spec:
         cpu: 10m
         memory: 10Mi
   deviceClaims:
-    devices:
-    - name: netdev0 # not used, but required
-      class: example.com-sriov-vf
-    - name: netdev1 # not used, but required
-      class: example.com-sriov-vf
-    - name: netdev2 # not used, but required
-      class: example.com-sriov-pf
+  - name: netdev0 # not used, but required
+    source:
+      forClass:
+        className: example.com-sriov-vf
+  - name: netdev1 # not used, but required
+    source:
+      forClass:
+        className: example.com-sriov-vf
+  - name: netdev2 # not used, but required
+    source:
+      forClass:
+        className: example.com-sriov-pf

dra-evolution/testdata/pod-multi-net-2.yaml

@@ -1,22 +1,20 @@
 # A Pod with two secondary SR-IOV VF interfaces, but
 # both from the same physical card (not necessarily the same PF though).
 #
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha1
+kind: ResourceClaimTemplate
 metadata:
-  name: template-example.com-sriov-two-vfs-same-card
+  name: example.com-sriov-two-vfs-same-card
   namespace: default
 spec:
   devices:
-  - name: netdevs # required but not used
-    allOf:
-    - class: example.com-sriov-vf
-      matchAttributes:
-      - hwdevname
-      requests:
-        devices: 2
+  - resourceClassName: example.com-sriov-vf
+    match:
+    - attribute: hwdevname.example.com-sriov
+    count:
+      minimum: 2
 ---
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha1
 kind: Pod
 metadata:
   name: multi-net
@@ -29,6 +27,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-example.com-sriov-two-vfs-same-card
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: example.com-sriov-two-vfs-same-card

dra-evolution/testdata/pod-multi-net-3.yaml

@@ -2,22 +2,22 @@
 # both from the same PF on the same card ("pf" is just
 # an index, so it needs the card name to qualify it).
 #
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha2
+kind: ResourceClaimTemplate
 metadata:
-  name: template-example.com-sriov-two-vfs-same-pf
+  name: example.com-sriov-two-vfs-same-pf
   namespace: default
 spec:
-  devices:
-  - name: netdevs # required but not used
-    allOf:
-    - class: example.com-sriov-vf
-      matchAttributes:
-      - hwdevname
-      - pf
-      requests:
-        devices: 2
+  spec:
+    requests:
+    - resourceClassName: example.com-sriov-vf
+      match:
+      - attribute: hwdevname.example.com-sriov
+      - attribute: pf.example.com-sriov
+      count:
+        minimum: 2
 ---
+apiVersion: resource.k8s.io/v1alpha2
 apiVersion: v1
 kind: Pod
 metadata:
@@ -31,6 +31,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-example.com-sriov-two-vfs-same-pf
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: example.com-sriov-two-vfs-same-pf

dra-evolution/testdata/pod-multi-net-4.yaml

@@ -3,20 +3,22 @@
 # since example.org does things differently. But if we can agree on the right
 # conventions, we will be better off.
 #
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha2
+kind: ResourceClaimTemplate
 metadata:
-  name: template-sriov-two-vfs
+  name: sriov-two-vfs
   namespace: default
 spec:
-  devices:
-  - name: netdevs # required but not used
-    allOf:
-    - class: sriov-nic # this is our cross-driver label selector based class
-      constraints: "device.sriovType == 'vf'"
-      devices: 2
+  spec:
+    requests:
+    - resourceClassName: sriov-nic # this is our cross-driver label selector based class
+      filter:
+      - device:
+          selector: "device.stringAttributes['type.nic.k8s.io']== 'vf'"
+      count:
+       minimum: 2
 ---
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha2
 kind: Pod
 metadata:
   name: multi-net
@@ -29,6 +31,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-sriov-two-vfs
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: sriov-two-vfs

dra-evolution/testdata/pod-multi-net-5.yaml

@@ -3,18 +3,18 @@
 # example.com, we need a different style of claim. This uses per-device
 # requests. Seems worse to me.
 #
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha2
+kind: ResourceClaimTemplate
 metadata:
-  name: template-example.org-sriov-vf
+  name: example.org-sriov-vf
   namespace: default
 spec:
-  devices:
-  - name: netdevs # required but not used
-    allOf:
-    - class: example.org-sriov-nic
-      requests:
-        vf: 1
+  spec:
+    requests:
+    - resourceClassName: example.org-sriov-nic
+      filter:
+      - device:
+          selector: "device.quantityAttributes['vf.example.org-sriov'].compareTo(quantity('1')) >= 0"
 ---
 apiVersion: v1
 kind: Pod
@@ -29,6 +29,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-example.org-sriov-vf
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: example.org-sriov-vf

dra-evolution/testdata/pod-multi-net-6.yaml

@@ -27,32 +27,37 @@ metadata:
   name: greennet
   namespace: default
 ---
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha2
+kind: ResourceClaimTemplate
 metadata:
-  name: template-sriov-blue-red-green
+  name: sriov-blue-red-green
   namespace: default
 spec:
-  devices:
-  - name: ip-networks
-    allOf:
-    - class: sriov-nic
+  spec:
+    requests:
+    - resourceClassName: sriov-nic
       config:
-      - apiVersion: fabric.example.com/v1alpha1
-        kind: IPNetwork
-        name: bluenet
-    - class: sriov-nic
+        vendor:
+        - parameters:
+            apiVersion: fabric.example.com/v1alpha1
+            kind: IPNetwork
+            name: bluenet
+    - resourceClassName: sriov-nic
       config:
-      - apiVersion: fabric.example.com/v1alpha1
-        kind: IPNetwork
-        name: rednet
-    - class: sriov-nic
+        vendor:
+        - parameters:
+            apiVersion: fabric.example.com/v1alpha1
+            kind: IPNetwork
+            name: rednet
+    - resourceClassName: sriov-nic
       config:
-      - apiVersion: fabric.example.com/v1alpha1
-        kind: IPNetwork
-        name: greennet
+        vendor:
+        - parameters:
+            apiVersion: fabric.example.com/v1alpha1
+            kind: IPNetwork
+            name: greennet
 ---
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha2
 kind: Pod
 metadata:
   name: blue-red-green
@@ -65,6 +70,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-sriov-blue-red-green
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: sriov-blue-red-green

dra-evolution/testdata/pod-multi-net-7.yaml

@@ -3,21 +3,21 @@
 # Probably in real life this is almost never needed, because you would
 # usually only have on vendor's cards in a given node.
 #
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha2
+kind: ResourceClaimTemplate
 metadata:
-  name: template-sriov-four-same-vendor
+  name: sriov-four-same-vendor
   namespace: default
 spec:
-  devices:
-  - name: netdevs # required but not used
-    allOf:
-    - class: sriov-nic
-      matchAttributes:
-      - vendor
-      devices: 4
+  spec:
+    requests:
+    - resourceClassName: sriov-nic
+      match:
+      - attribute: vendor.dra.k8s.io
+      count:
+        minimum: 4
 ---
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha2
 kind: Pod
 metadata:
   name: multi-net
@@ -30,6 +30,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-sriov-four-same-vendor
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: sriov-four-same-vendor

dra-evolution/testdata/pod-multi-net-8.yaml

@@ -4,23 +4,22 @@
 # NOTE: `distinctAttributes` is not actually in the model yet. Is it
 # useful?
 #
-apiVersion: devmgmtproto.k8s.io/v1alpha1
-kind: DeviceClaim
+apiVersion: resource.k8s.io/v1alpha2
+kind: ResourceClaimTemplate
 metadata:
-  name: template-sriov-four-same-vendor-diff-cards
+  name: sriov-four-same-vendor-diff-cards
   namespace: default
 spec:
-  devices:
-  - name: netdevs # required but not used
-    allOf:
-    - class: sriov-nic
-      matchAttributes:
-      - vendor
-      distinctAttributes:
-      - hwdevname
-      devices: 4
+  spec:
+    requests:
+    - resourceClassName: sriov-nic
+      match:
+      - attribute: vendor.dra.k8s.io
+      #- expression: "device.distinctAttributes('hwdevname.dra.k8s.io')"
+      count:
+        minimum: 4
 ---
-apiVersion: v1
+apiVersion: resource.k8s.io/v1alpha2
 kind: Pod
 metadata:
   name: multi-net
@@ -33,6 +32,6 @@ spec:
       requests:
         cpu: 10m
         memory: 10Mi
-  deviceClaims:
-    template:
-      claimName: template-sriov-four-same-vendor-diff-cards
+  resourceClaims:
+  - source:
+      resourceClaimTemplateName: sriov-four-same-vendor-diff-cards