feat: Add node info to list resource (#10118)

* fix pdb schema

* make fix

* fix details

* add node info to list

* make fix

* make schema

* make schema

Author: maciaszczykm

modules/api/pkg/resource/node/detail.go

@@ -96,9 +96,6 @@ type NodeDetail struct {
 	// Unschedulable controls node schedulability of new pods. By default node is schedulable.
 	Unschedulable bool `json:"unschedulable"`
 
-	// Set of ids/uuids to uniquely identify the node.
-	NodeInfo v1.NodeSystemInfo `json:"nodeInfo"`
-
 	// Conditions is an array of current node conditions.
 	Conditions []common.Condition `json:"conditions"`
 
@@ -285,13 +282,13 @@ func toNodeDetail(node v1.Node, pods *pod.PodList, eventList *common.EventList,
 			TypeMeta:           types.NewTypeMeta(types.ResourceKindNode),
 			Ready:              getNodeConditionStatus(node, v1.NodeReady),
 			AllocatedResources: allocatedResources,
+			NodeInfo:           node.Status.NodeInfo,
 		},
 		// TODO: Remove deprecated field
 		Phase:           node.Status.Phase,
 		ProviderID:      node.Spec.ProviderID,
 		PodCIDR:         node.Spec.PodCIDR,
 		Unschedulable:   node.Spec.Unschedulable,
-		NodeInfo:        node.Status.NodeInfo,
 		Conditions:      getNodeConditions(node),
 		ContainerImages: getContainerImages(node),
 		PodList:         *pods,

modules/api/pkg/resource/node/list.go

@@ -45,6 +45,9 @@ type Node struct {
 	TypeMeta           types.TypeMeta         `json:"typeMeta"`
 	Ready              v1.ConditionStatus     `json:"ready"`
 	AllocatedResources NodeAllocatedResources `json:"allocatedResources"`
+
+	// Set of ids/uuids to uniquely identify the node.
+	NodeInfo v1.NodeSystemInfo `json:"nodeInfo"`
 }
 
 // GetNodeList returns a list of all Nodes in the cluster.
@@ -101,6 +104,7 @@ func toNode(node v1.Node, pods *v1.PodList) Node {
 		TypeMeta:           types.NewTypeMeta(types.ResourceKindNode),
 		Ready:              getNodeConditionStatus(node, v1.NodeReady),
 		AllocatedResources: allocatedResources,
+		NodeInfo:           node.Status.NodeInfo,
 	}
 }
 

modules/api/schema/swagger.json

@@ -10479,13 +10479,13 @@
   },
   "cronjob.CronJobDetail": {
    "required": [
-    "active",
-    "lastSchedule",
     "containerImages",
     "objectMeta",
     "typeMeta",
     "schedule",
     "suspend",
+    "active",
+    "lastSchedule",
     "concurrencyPolicy",
     "startingDeadlineSeconds",
     "errors"
@@ -10828,11 +10828,11 @@
   },
   "deployment.DeploymentDetail": {
    "required": [
+    "initContainerImages",
     "objectMeta",
     "typeMeta",
     "pods",
     "containerImages",
-    "initContainerImages",
     "selector",
     "statusInfo",
     "conditions",
@@ -11147,13 +11147,13 @@
   },
   "horizontalpodautoscaler.HorizontalPodAutoscalerDetail": {
    "required": [
-    "typeMeta",
-    "scaleTargetRef",
     "minReplicas",
     "maxReplicas",
     "currentCPUUtilizationPercentage",
     "targetCPUUtilizationPercentage",
     "objectMeta",
+    "typeMeta",
+    "scaleTargetRef",
     "currentReplicas",
     "desiredReplicas",
     "lastScaleTime"
@@ -11450,13 +11450,13 @@
   },
   "job.JobDetail": {
    "required": [
-    "jobStatus",
     "objectMeta",
     "typeMeta",
     "podInfo",
     "containerImages",
     "initContainerImages",
     "parallelism",
+    "jobStatus",
     "completions",
     "errors"
    ],
@@ -11860,12 +11860,16 @@
     "objectMeta",
     "typeMeta",
     "ready",
-    "allocatedResources"
+    "allocatedResources",
+    "nodeInfo"
    ],
    "properties": {
     "allocatedResources": {
      "$ref": "#/definitions/node.NodeAllocatedResources"
     },
+    "nodeInfo": {
+     "$ref": "#/definitions/v1.NodeSystemInfo"
+    },
     "objectMeta": {
      "$ref": "#/definitions/types.ObjectMeta"
     },
@@ -11950,6 +11954,7 @@
   },
   "node.NodeDetail": {
    "required": [
+    "nodeInfo",
     "objectMeta",
     "typeMeta",
     "ready",
@@ -11958,7 +11963,6 @@
     "podCIDR",
     "providerID",
     "unschedulable",
-    "nodeInfo",
     "conditions",
     "containerImages",
     "podList",
@@ -12147,16 +12151,16 @@
   },
   "persistentvolume.PersistentVolumeDetail": {
    "required": [
-    "objectMeta",
-    "capacity",
     "storageClass",
     "claim",
     "reason",
+    "objectMeta",
     "typeMeta",
     "accessModes",
-    "reclaimPolicy",
     "mountOptions",
     "status",
+    "capacity",
+    "reclaimPolicy",
     "message",
     "persistentVolumeSource"
    ],
@@ -12274,13 +12278,13 @@
   },
   "persistentvolumeclaim.PersistentVolumeClaimDetail": {
    "required": [
-    "objectMeta",
     "typeMeta",
     "status",
     "volume",
     "capacity",
     "accessModes",
-    "storageClass"
+    "storageClass",
+    "objectMeta"
    ],
    "properties": {
     "accessModes": {
@@ -12761,14 +12765,14 @@
   "poddisruptionbudget.PodDisruptionBudgetDetail": {
    "required": [
     "minAvailable",
-    "maxUnavailable",
     "unhealthyPodEvictionPolicy",
-    "currentHealthy",
+    "expectedPods",
     "objectMeta",
     "typeMeta",
+    "maxUnavailable",
+    "currentHealthy",
     "desiredHealthy",
     "disruptionsAllowed",
-    "expectedPods",
     "disruptedPods"
    ],
    "properties": {
@@ -12872,11 +12876,11 @@
   },
   "replicaset.ReplicaSetDetail": {
    "required": [
-    "podInfo",
-    "containerImages",
     "initContainerImages",
     "objectMeta",
     "typeMeta",
+    "podInfo",
+    "containerImages",
     "selector",
     "horizontalPodAutoscalerList",
     "errors"
@@ -12986,11 +12990,11 @@
   },
   "replicationcontroller.ReplicationControllerDetail": {
    "required": [
-    "typeMeta",
-    "podInfo",
     "containerImages",
     "initContainerImages",
     "objectMeta",
+    "typeMeta",
+    "podInfo",
     "labelSelector",
     "errors"
    ],
@@ -13366,9 +13370,9 @@
   },
   "secret.SecretDetail": {
    "required": [
+    "objectMeta",
     "typeMeta",
     "type",
-    "objectMeta",
     "data"
    ],
    "properties": {
@@ -13455,13 +13459,13 @@
   },
   "service.ServiceDetail": {
    "required": [
+    "objectMeta",
+    "typeMeta",
     "internalEndpoint",
     "externalEndpoints",
     "selector",
     "type",
     "clusterIP",
-    "objectMeta",
-    "typeMeta",
     "endpointList",
     "sessionAffinity",
     "errors"
@@ -13625,11 +13629,11 @@
   },
   "statefulset.StatefulSetDetail": {
    "required": [
-    "containerImages",
-    "initContainerImages",
     "objectMeta",
     "typeMeta",
     "podInfo",
+    "containerImages",
+    "initContainerImages",
     "errors"
    ],
    "properties": {

modules/web/i18n/messages.xlf

@@ -1969,4 +1969,4 @@
       </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>