Explorar el Código

Review updates

Matt Bolt hace 6 años
padre
commit
6dbb51fe7f
Se han modificado 2 ficheros con 7 adiciones y 4 borrados
  1. 2 2
      costmodel/costmodel.go
  2. 5 2
      costmodel/networkcosts.go

+ 2 - 2
costmodel/costmodel.go

@@ -411,7 +411,7 @@ func (cm *CostModel) ComputeCostData(cli prometheusClient.Client, clientset kube
 	networkUsageMap, err := GetNetworkUsageData(resultNetZoneRequests, resultNetRegionRequests, resultNetInternetRequests, false)
 	networkUsageMap, err := GetNetworkUsageData(resultNetZoneRequests, resultNetRegionRequests, resultNetInternetRequests, false)
 	if err != nil {
 	if err != nil {
 		klog.V(1).Infof("Unable to get Network Cost Data: %s", err.Error())
 		klog.V(1).Infof("Unable to get Network Cost Data: %s", err.Error())
-		return nil, err
+		networkUsageMap = make(map[string]*NetworkUsageData)
 	}
 	}
 
 
 	containerNameCost := make(map[string]*CostData)
 	containerNameCost := make(map[string]*CostData)
@@ -1298,7 +1298,7 @@ func (cm *CostModel) ComputeCostDataRange(cli prometheusClient.Client, clientset
 	networkUsageMap, err := GetNetworkUsageData(resultNetZoneRequests, resultNetRegionRequests, resultNetInternetRequests, true)
 	networkUsageMap, err := GetNetworkUsageData(resultNetZoneRequests, resultNetRegionRequests, resultNetInternetRequests, true)
 	if err != nil {
 	if err != nil {
 		klog.V(1).Infof("Unable to get Network Cost Data: %s", err.Error())
 		klog.V(1).Infof("Unable to get Network Cost Data: %s", err.Error())
-		return nil, err
+		networkUsageMap = make(map[string]*NetworkUsageData)
 	}
 	}
 
 
 	containerNameCost := make(map[string]*CostData)
 	containerNameCost := make(map[string]*CostData)

+ 5 - 2
costmodel/networkcosts.go

@@ -1,8 +1,8 @@
 package costmodel
 package costmodel
 
 
 import (
 import (
-	"math"
 	"fmt"
 	"fmt"
+	"math"
 	"strconv"
 	"strconv"
 
 
 	costAnalyzerCloud "github.com/kubecost/cost-model/cloud"
 	costAnalyzerCloud "github.com/kubecost/cost-model/cloud"
@@ -199,7 +199,10 @@ func getNetworkUsageVector(qr interface{}) (map[string]*NetworkUsageVector, erro
 		}
 		}
 		var vectors []*Vector
 		var vectors []*Vector
 		strVal := value[1].(string)
 		strVal := value[1].(string)
-		v, _ := strconv.ParseFloat(strVal, 64)
+		v, err := strconv.ParseFloat(strVal, 64)
+		if err != nil {
+			return nil, err
+		}
 
 
 		vectors = append(vectors, &Vector{
 		vectors = append(vectors, &Vector{
 			Timestamp: value[0].(float64),
 			Timestamp: value[0].(float64),