Merge pull request #687 from tu1h/fix_noderesourcestopo_api

Update api version and field for noderesourcetopology
kubernetes-sigs · Jan 5, 2024 · d9c3dcc · d9c3dcc
2 parents c0a200b + fafdc9b
commit d9c3dcc
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/manifests/noderesourcetopology/worker-node-A.yaml b/manifests/noderesourcetopology/worker-node-A.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: topology.node.k8s.io/v1alpha1
+apiVersion: topology.node.k8s.io/v1alpha2
 kind: NodeResourceTopology
 metadata:
   name: worker-node-a
@@ -11,21 +11,27 @@ zones:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 1
         allocatable: 1
+        available: 1
       - name: example.com/deviceB
         capacity: 2
         allocatable: 2
+        available: 2
   - name: node-1
     type: Node
     resources:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 2
         allocatable: 2
+        available: 2
       - name: example.com/deviceB
         capacity: 1
         allocatable: 1
+        available: 1
diff --git a/manifests/noderesourcetopology/worker-node-B.yaml b/manifests/noderesourcetopology/worker-node-B.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: topology.node.k8s.io/v1alpha1
+apiVersion: topology.node.k8s.io/v1alpha2
 kind: NodeResourceTopology
 metadata:
   name: worker-node-b
@@ -11,15 +11,19 @@ zones:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 3
         allocatable: 3
+        available: 3
   - name: node-1
     type: Node
     resources:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceB
         capacity: 3
         allocatable: 3
+        available: 3
diff --git a/pkg/noderesourcetopology/README.md b/pkg/noderesourcetopology/README.md
@@ -197,24 +197,30 @@ zones:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 1
         allocatable: 1
+        available: 1
       - name: example.com/deviceB
         capacity: 2
         allocatable: 2
+        available: 2
   - name: numa-node-1
     type: Node
     resources:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 2
         allocatable: 2
+        available: 2
       - name: example.com/deviceB
         capacity: 1
         allocatable: 1
+        available: 1
 ```
 
 ```yaml
@@ -231,18 +237,22 @@ zones:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 3
         allocatable: 3
+        available: 3
   - name: numa-node-1
     type: Node
     resources:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceB
         capacity: 3
         allocatable: 3
+        available: 3
 ```
 
 - Verify if the CRD has been created by running

diff --git a/site/content/en/docs/plugins/noderesourcetopology.md b/site/content/en/docs/plugins/noderesourcetopology.md
@@ -195,24 +195,30 @@ zones:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 1
         allocatable: 1
+        available: 1
       - name: example.com/deviceB
         capacity: 2
         allocatable: 2
+        available: 2
   - name: numa-node-1
     type: Node
     resources:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 2
         allocatable: 2
+        available: 2
       - name: example.com/deviceB
         capacity: 1
         allocatable: 1
+        available: 1
 ```
 
 ```yaml
@@ -229,18 +235,22 @@ zones:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceA
         capacity: 3
         allocatable: 3
+        available: 3
   - name: numa-node-1
     type: Node
     resources:
       - name: cpu
         capacity: 4
         allocatable: 3
+        available: 3
       - name: example.com/deviceB
         capacity: 3
         allocatable: 3
+        available: 3
 ```
 
 - Verify if the CRD has been created by running