diff --git a/internal/reports/cluster.go b/internal/reports/cluster.go index 66281061..ad8d9131 100644 --- a/internal/reports/cluster.go +++ b/internal/reports/cluster.go @@ -478,14 +478,14 @@ func findInClusterReport(cluster *core.Cluster, report *limesresources.ClusterRe if !cluster.HasResource(serviceType, *resourceName) { return service, nil } + globalBehavior := cluster.BehaviorForResource(serviceType, *resourceName, "") resource = &limesresources.ClusterResourceReport{ - ResourceInfo: cluster.InfoForResource(serviceType, *resourceName), + ResourceInfo: cluster.InfoForResource(serviceType, *resourceName), + CommitmentConfig: globalBehavior.ToCommitmentConfig(now), } if !resource.ResourceInfo.NoQuota { qdConfig := cluster.QuotaDistributionConfigForResource(serviceType, *resourceName) resource.QuotaDistributionModel = qdConfig.Model - globalBehavior := cluster.BehaviorForResource(serviceType, *resourceName, "") - resource.CommitmentConfig = globalBehavior.ToCommitmentConfig(now) //We need to set a default value here. Otherwise zero values will never //be reported when there are no `domain_resources` entries to aggregate //over. diff --git a/internal/reports/domain.go b/internal/reports/domain.go index 2df5179d..4f36a664 100644 --- a/internal/reports/domain.go +++ b/internal/reports/domain.go @@ -381,14 +381,14 @@ func (d domains) Find(cluster *core.Cluster, domainUUID, domainName string, serv localBehavior := cluster.BehaviorForResource(*serviceType, *resourceName, domainName) globalBehavior := cluster.BehaviorForResource(*serviceType, *resourceName, "") resource = &limesresources.DomainResourceReport{ - ResourceInfo: cluster.InfoForResource(*serviceType, *resourceName), - Scaling: globalBehavior.ToScalingBehavior(), - Annotations: localBehavior.Annotations, + ResourceInfo: cluster.InfoForResource(*serviceType, *resourceName), + Scaling: globalBehavior.ToScalingBehavior(), + Annotations: localBehavior.Annotations, + CommitmentConfig: globalBehavior.ToCommitmentConfig(now), } if !resource.NoQuota { qdConfig := cluster.QuotaDistributionConfigForResource(*serviceType, *resourceName) resource.QuotaDistributionModel = qdConfig.Model - resource.CommitmentConfig = globalBehavior.ToCommitmentConfig(now) //this default is used when no `domain_resources` entry exists for this resource defaultQuota := uint64(0) resource.DomainQuota = &defaultQuota