Merge pull request #158 from linkernetworks/phstsai/VX-208

[Task] VX-208: Remove EphemeralStorage resource from node struct
linkernetworks · Jul 24, 2018 · e782dc6 · e782dc6
2 parents 6069e60 + 0852afc
commit e782dc6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/API.md b/API.md
@@ -565,11 +565,9 @@ Response Data:
    "allocatableCPU": 2,
    "allocatableMemory": 4038615000,
    "allocatablePods": 110,
-   "allocatableEphemeralStorage": 9306748000,
    "capacityCPU": 2,
    "capacityMemory": 4143472600,
    "capacityPods": 110,
-   "capacityEphemeralStorage": 10340831000
   },
   "nics": {
    "cni0": {

diff --git a/src/entity/metrics_node.go b/src/entity/metrics_node.go
@@ -27,18 +27,16 @@ type NICOverviewMetrics struct {
 
 // NodeResourceMetrics is the structure for node resource metrics
 type NodeResourceMetrics struct {
-	CPURequests                 float32 `json:"cpuRequests"`
-	CPULimits                   float32 `json:"cpuLimits"`
-	MemoryRequests              float32 `json:"memoryRequests"`
-	MemoryLimits                float32 `json:"memoryLimits"`
-	AllocatableCPU              float32 `json:"allocatableCPU"`
-	AllocatableMemory           float32 `json:"allocatableMemory"`
-	AllocatablePods             float32 `json:"allocatablePods"`
-	AllocatableEphemeralStorage float32 `json:"allocatableEphemeralStorage"`
-	CapacityCPU                 float32 `json:"capacityCPU"`
-	CapacityMemory              float32 `json:"capacityMemory"`
-	CapacityPods                float32 `json:"capacityPods"`
-	CapacityEphemeralStorage    float32 `json:"capacityEphemeralStorage"`
+	CPURequests       float32 `json:"cpuRequests"`
+	CPULimits         float32 `json:"cpuLimits"`
+	MemoryRequests    float32 `json:"memoryRequests"`
+	MemoryLimits      float32 `json:"memoryLimits"`
+	AllocatableCPU    float32 `json:"allocatableCPU"`
+	AllocatableMemory float32 `json:"allocatableMemory"`
+	AllocatablePods   float32 `json:"allocatablePods"`
+	CapacityCPU       float32 `json:"capacityCPU"`
+	CapacityMemory    float32 `json:"capacityMemory"`
+	CapacityPods      float32 `json:"capacityPods"`
 }
 
 // NodeDetailMetrics is the structure for node detail metrics

diff --git a/src/prometheuscontroller/expression.go b/src/prometheuscontroller/expression.go
@@ -386,8 +386,6 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 				node.Resource.AllocatableMemory = float32(result.Value)
 			case "pods":
 				node.Resource.AllocatablePods = float32(result.Value)
-			case "ephemeral_storage":
-				node.Resource.AllocatableEphemeralStorage = float32(result.Value)
 			}
 
 		case "kube_node_status_capacity":
@@ -398,8 +396,6 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 				node.Resource.CapacityMemory = float32(result.Value)
 			case "pods":
 				node.Resource.CapacityPods = float32(result.Value)
-			case "ephemeral_storage":
-				node.Resource.CapacityEphemeralStorage = float32(result.Value)
 			}
 		}
 	}