diff --git a/internal/model/model.go b/internal/model/model.go index 20b3e8a..07c6428 100644 --- a/internal/model/model.go +++ b/internal/model/model.go @@ -58,8 +58,8 @@ func (s *Model) CreateEnvironment(name string, size int) { }, Memory: &pb.EnvironmentResourcesMemory{ // In GB. - Current: 128 * int64(size) * 1024 * 1024, - Limit: 512 * int64(size) * 1024 * 1024, + Current: 128 * int64(size) * 1024, + Limit: 512 * int64(size) * 1024, }, Replicas: &pb.EnvironmentResourcesReplicas{ Current: 1 * int32(size), diff --git a/internal/server/mock/project/server.go b/internal/server/mock/project/server.go index 57536d9..e8335df 100644 --- a/internal/server/mock/project/server.go +++ b/internal/server/mock/project/server.go @@ -105,9 +105,9 @@ func buildProject(model *model.Model, id string) (*pb.Project, error) { Contact: project.Contact, Size: project.Size, ResourceTotals: &pb.ProjectResourceTotals{ - CPU: 10, - Memory: 4096, - Replicas: 3, + CPU: 0, + Memory: 0, + Replicas: 0, }, Environments: &pb.ProjectEnvironments{ NonProd: []string{}, @@ -116,6 +116,10 @@ func buildProject(model *model.Model, id string) (*pb.Project, error) { environments := model.GetEnvironments() for _, env := range environments { + respProject.ResourceTotals.CPU = respProject.ResourceTotals.CPU + env.Environment.Resources.CPU.Limit + respProject.ResourceTotals.Memory = respProject.ResourceTotals.Memory + env.Environment.Resources.Memory.Limit + respProject.ResourceTotals.Replicas = respProject.ResourceTotals.Replicas + env.Environment.Resources.Replicas.Max + if env.Environment.Production { respProject.Environments.Prod = env.Environment.Name respProject.Version = env.Environment.Version