Merge pull request #49 from natron-io/clean_code

get ingress by name
netricsag · Jan 28, 2022 · 4e3e419 · 4e3e419
2 parents f2143de + 8b25a8b
commit 4e3e419
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/controllers/costController.go b/controllers/costController.go
@@ -299,8 +299,8 @@ func GetIngressCostSum(c *fiber.Ctx) error {
 	// create a map for each tenant with a added ingress costs only if cost is not 0
 	tenantIngressCosts := make(map[string]float64)
 	for _, tenant := range tenants {
-		if tenantIngressRequests[tenant] != 0 {
-			tenantIngressCosts[tenant] = util.GetIngressCost(tenantIngressRequests[tenant])
+		if len(tenantIngressRequests[tenant]) != 0 {
+			tenantIngressCosts[tenant] = util.GetIngressCost(len(tenantIngressRequests[tenant]))
 		}
 	}
 
@@ -345,8 +345,8 @@ func GetTenantIngressCostSum(c *fiber.Ctx) error {
 	// create a map for each tenant with a added ingress costs only if cost is not 0
 	tenantIngressCosts := make(map[string]float64)
 	for _, tenant := range tenants {
-		if tenantIngressRequests[tenant] != 0 {
-			tenantIngressCosts[tenant] = util.GetIngressCost(tenantIngressRequests[tenant])
+		if len(tenantIngressRequests[tenant]) != 0 {
+			tenantIngressCosts[tenant] = util.GetIngressCost(len(tenantIngressRequests[tenant]))
 		}
 	}
 

diff --git a/util/costs.go b/util/costs.go
@@ -35,6 +35,6 @@ func GetStorageCost(storageClass string, size float64) (float64, error) {
 	return (STORAGE_COST[storageClass]["cost"] * float64(size) / (1024 * 1024 * 1024)) * (1 - STORAGE_DISCOUNT_PERCENT), nil
 }
 
-func GetIngressCost(ingress int64) float64 {
+func GetIngressCost(ingress int) float64 {
 	return (INGRESS_COST * float64(ingress)) * (1 - INGRESS_DISCOUNT_PERCENT)
 }
diff --git a/util/k8s.go b/util/k8s.go
@@ -233,8 +233,8 @@ func GetStorageRequestsSumByTenant(tenants []string) (map[string]map[string]int6
 	return tenantPVCs, nil
 }
 
-func GetIngressRequestsSumByTenant(tenants []string) (map[string]int64, error) {
-	tenantsIngress := make(map[string]int64)
+func GetIngressRequestsSumByTenant(tenants []string) (map[string][]string, error) {
+	tenantsIngress := make(map[string][]string)
 
 	for _, tenant := range tenants {
 		namespaces, err := Clientset.CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{
@@ -272,7 +272,8 @@ func GetIngressRequestsSumByTenant(tenants []string) (map[string]int64, error) {
 
 				INGRESS_DISCOUNT_PERCENT = discountFloat
 
-				tenantsIngress[tenant] += int64(len(ingress.Spec.Rules))
+				// apend ingress hostname to the list of ingress for the tenant
+				tenantsIngress[tenant] = append(tenantsIngress[tenant], ingress.Name)
 			}
 		}
 	}