Merge pull request #79 from natron-io/pvcs_by_storageclass

implement pvcs by storageclass

controllers/tenantController.go

@@ -77,17 +77,17 @@ func GetPVCs(c *fiber.Ctx) error {
 	}
 
 	// create a map for each tenant with a added memory requests
-	tenantPVCs, err := util.GetPVCsByTenant(tenants)
+	tenantPVCsByStorageClass, err := util.GetPVCsByTenantByStorageClass(tenants)
 	if err != nil {
 		return c.Status(500).JSON(fiber.Map{
 			"message": "Internal Server Error",
 		})
 	}
 
 	if tenant == "" {
-		return c.JSON(tenantPVCs)
+		return c.JSON(tenantPVCsByStorageClass)
 	} else {
-		return c.JSON(tenantPVCs[tenant])
+		return c.JSON(tenantPVCsByStorageClass[tenant])
 	}
 }
 

util/k8s.go

@@ -35,18 +35,30 @@ func GetPodsByTenant(tenants []string) (map[string][]string, error) {
 	return tenantPods, nil
 }
 
-func GetPVCsByTenant(tenants []string) (map[string][]string, error) {
-	tenantPVCs := make(map[string][]string)
+func GetPVCsByTenantByStorageClass(tenants []string) (map[string]map[string][]string, error) {
+	tenantPVCs := make(map[string]map[string][]string)
+	storageClasses, err := GetStorageClassesInCluster()
+	if err != nil {
+		return nil, err
+	}
+
 	for _, tenant := range tenants {
-		pvcList, err := Clientset.CoreV1().PersistentVolumeClaims(tenant).List(context.TODO(), metav1.ListOptions{})
-		if err != nil && !strings.Contains(err.Error(), "not found") {
-			return nil, err
-		}
+		tenantPVCs[tenant] = make(map[string][]string)
+		for _, storageClass := range storageClasses {
+			// get pvc by storageclass pvc spec
+			pvcs, err := Clientset.CoreV1().PersistentVolumeClaims(tenant).List(context.TODO(), metav1.ListOptions{})
+			if err != nil && !strings.Contains(err.Error(), "not found") {
+				return nil, err
+			}
 
-		for _, pvc := range pvcList.Items {
-			tenantPVCs[tenant] = append(tenantPVCs[tenant], pvc.Name)
+			for _, pvc := range pvcs.Items {
+				if *pvc.Spec.StorageClassName == storageClass {
+					tenantPVCs[tenant][storageClass] = append(tenantPVCs[tenant][storageClass], pvc.Name)
+				}
+			}
 		}
 	}
+
 	return tenantPVCs, nil
 }