Merge pull request #397 from kubecost/develop

Merge develop into master

pkg/costmodel/costmodel.go

@@ -880,6 +880,7 @@ func findUnmountedPVCostData(unmountedPVs map[string][]*PersistentVolumeClaimDat
 				NodeName:        "",
 				Namespace:       ns,
 				NamespaceLabels: namespacelabels,
+				Labels:          namespacelabels,
 				ClusterID:       clusterID,
 				PVCData:         pv,
 			}
@@ -2476,7 +2477,11 @@ func getNamespaceLabels(cache clustercache.ClusterCache, clusterID string) (map[
 	nsToLabels := make(map[string]map[string]string)
 	nss := cache.GetAllNamespaces()
 	for _, ns := range nss {
-		nsToLabels[ns.Name+","+clusterID] = ns.Labels
+		labels := make(map[string]string)
+		for k, v := range ns.Labels {
+			labels[SanitizeLabelName(k)] = v
+		}
+		nsToLabels[ns.Name+","+clusterID] = labels
 	}
 	return nsToLabels, nil
 }

pkg/costmodel/promparsers.go

@@ -314,9 +314,14 @@ func GetNamespaceLabelsMetrics(queryResult interface{}, defaultClusterID string)
 		}
 
 		nsKey := ns + "," + clusterID
-		toReturn[nsKey] = val.GetLabels()
+		if nsLabels, ok := toReturn[nsKey]; ok {
+			for k, v := range val.GetLabels() {
+				nsLabels[k] = v // override with more recently assigned if we changed labels within the window.
+			}
+		} else {
+			toReturn[nsKey] = val.GetLabels()
+		}
 	}
-
 	return toReturn, nil
 }