fix: remove inline tag for corev1.ResourceList to fix #390 (#391)

Signed-off-by: Jason Liu <jasonliu747@gmail.com>
koordinator-sh · Jul 21, 2022 · bf308ed · bf308ed
1 parent f32a0ba
commit bf308ed
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/apis/slo/v1alpha1/resources.go b/apis/slo/v1alpha1/resources.go
@@ -23,6 +23,6 @@ import (
 )
 
 type ResourceMap struct {
-	corev1.ResourceList `json:",inline"`
+	corev1.ResourceList `json:"resources,omitempty"`
 	Devices             []schedulingv1alpha1.DeviceInfo `json:"devices,omitempty"`
 }
diff --git a/config/crd/bases/slo.koordinator.sh_nodemetrics.yaml b/config/crd/bases/slo.koordinator.sh_nodemetrics.yaml
@@ -57,12 +57,6 @@ spec:
                 description: NodeMetric contains the metrics for this node.
                 properties:
                   nodeUsage:
-                    additionalProperties:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                      x-kubernetes-int-or-string: true
                     properties:
                       devices:
                         items:
@@ -94,6 +88,16 @@ spec:
                               type: string
                           type: object
                         type: array
+                      resources:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: ResourceList is a set of (resource name, quantity)
+                          pairs.
+                        type: object
                     type: object
                 type: object
               podsMetric:
@@ -106,12 +110,6 @@ spec:
                     namespace:
                       type: string
                     podUsage:
-                      additionalProperties:
-                        anyOf:
-                        - type: integer
-                        - type: string
-                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                        x-kubernetes-int-or-string: true
                       properties:
                         devices:
                           items:
@@ -143,6 +141,16 @@ spec:
                                 type: string
                             type: object
                           type: array
+                        resources:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: ResourceList is a set of (resource name, quantity)
+                            pairs.
+                          type: object
                       type: object
                   type: object
                 type: array