Merge pull request #146 from kubecost/AjayTripathy-set-empty-storage-to-default

empty string storage set to default

cloud/awsprovider.go

@@ -378,10 +378,6 @@ func (k *awsKey) Features() string {
 }
 
 func (aws *AWS) PVPricing(pvk PVKey) (*PV, error) {
-	if pvk.GetStorageClass() == "" {
-		klog.V(3).Infof("Disk in %s does not have a storageclass set, cannot look up pricing info.", pvk.Features())
-		return &PV{}, nil
-	}
 	pricing, ok := aws.Pricing[pvk.Features()]
 	if !ok {
 		klog.V(4).Infof("Persistent Volume pricing not found for %s: %s", pvk.GetStorageClass(), pvk.Features())
@@ -495,6 +491,7 @@ func (aws *AWS) DownloadPricingData() error {
 		storageClassMap[storageClass.ObjectMeta.Name] = params
 		if storageClass.GetAnnotations()["storageclass.kubernetes.io/is-default-class"] == "true" || storageClass.GetAnnotations()["storageclass.beta.kubernetes.io/is-default-class"] == "true" {
 			storageClassMap["default"] = params
+			storageClassMap[""] = params
 		}
 	}
 

cloud/gcpprovider.go

@@ -681,6 +681,7 @@ func (gcp *GCP) DownloadPricingData() error {
 		storageClassMap[storageClass.ObjectMeta.Name] = params
 		if storageClass.GetAnnotations()["storageclass.kubernetes.io/is-default-class"] == "true" || storageClass.GetAnnotations()["storageclass.beta.kubernetes.io/is-default-class"] == "true" {
 			storageClassMap["default"] = params
+			storageClassMap[""] = params
 		}
 	}
 
@@ -705,10 +706,6 @@ func (gcp *GCP) DownloadPricingData() error {
 }
 
 func (gcp *GCP) PVPricing(pvk PVKey) (*PV, error) {
-	if pvk.GetStorageClass() == "" {
-		klog.V(3).Infof("Disk in %s does not have a storageclass set, cannot look up pricing info.", pvk.Features())
-		return &PV{}, nil
-	}
 	gcp.DownloadPricingDataLock.RLock()
 	defer gcp.DownloadPricingDataLock.RUnlock()
 	pricing, ok := gcp.Pricing[pvk.Features()]

costmodel/costmodel.go

@@ -757,6 +757,7 @@ func addPVData(clientset kubernetes.Interface, pvClaimMapping map[string]*Persis
 		storageClassMap[storageClass.ObjectMeta.Name] = params
 		if storageClass.GetAnnotations()["storageclass.kubernetes.io/is-default-class"] == "true" || storageClass.GetAnnotations()["storageclass.beta.kubernetes.io/is-default-class"] == "true" {
 			storageClassMap["default"] = params
+			storageClassMap[""] = params
 		}
 	}
 

main.go

@@ -418,6 +418,7 @@ func (a *Accesses) recordPrices() {
 					storageClassMap[storageClass.ObjectMeta.Name] = params
 					if storageClass.GetAnnotations()["storageclass.kubernetes.io/is-default-class"] == "true" || storageClass.GetAnnotations()["storageclass.beta.kubernetes.io/is-default-class"] == "true" {
 						storageClassMap["default"] = params
+						storageClassMap[""] = params
 					}
 				}