From 93f48f5e813f6f63b26b391ea3c2fa5d448f578f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:12:27 +0000 Subject: [PATCH] Renovate: Update github.com/sapcc --- go.mod | 6 +++--- go.sum | 12 ++++++------ .../limes/resources/metadata.go | 17 +++++++++-------- .../limes/resources/report_project.go | 1 - vendor/modules.txt | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 41842167..3eccbdc9 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/gorilla/mux v1.8.1 github.com/prometheus/client_golang v1.17.0 github.com/rs/cors v1.10.1 - github.com/sapcc/go-api-declarations v1.10.4 - github.com/sapcc/go-bits v0.0.0-20231207102323-7b1f750ed23f - github.com/sapcc/gophercloud-sapcc v0.0.0-20231207102321-ccb7578c58b1 + github.com/sapcc/go-api-declarations v1.10.5 + github.com/sapcc/go-bits v0.0.0-20231213211425-ddd5e41f8535 + github.com/sapcc/gophercloud-sapcc v0.0.0-20231214091214-e4517ca1b6a4 go.uber.org/automaxprocs v1.5.3 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 25d71128..1e08905a 100644 --- a/go.sum +++ b/go.sum @@ -151,12 +151,12 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/sapcc/go-api-declarations v1.10.4 h1:ZUq/2GjOMaKTVuWQrhY09Hu20Smk3SbDqItCJT0H9mg= -github.com/sapcc/go-api-declarations v1.10.4/go.mod h1:83R3hTANhuRXt/pXDby37IJetw8l7DG41s33Tp9NXxI= -github.com/sapcc/go-bits v0.0.0-20231207102323-7b1f750ed23f h1:4ZyFCoD41dNz/W69SpkE6W97rVkJEIaVE+M4NmFf+JQ= -github.com/sapcc/go-bits v0.0.0-20231207102323-7b1f750ed23f/go.mod h1:jsn7K60WbjIzXz5V38eeHP2SNsBsCpFOtbXOSsBZXoQ= -github.com/sapcc/gophercloud-sapcc v0.0.0-20231207102321-ccb7578c58b1 h1:v3Fw4NzccL94uIjksUeae8TaR4cM/WpHthjQqwQ1EZo= -github.com/sapcc/gophercloud-sapcc v0.0.0-20231207102321-ccb7578c58b1/go.mod h1:5xn8YcYXweyv3DriB2weiVI5PyEqb0ea1JugKHxN/J4= +github.com/sapcc/go-api-declarations v1.10.5 h1:1jGXudH2kcS0JCfGqooHszhSIe7BCvqu7QYJdqfas0A= +github.com/sapcc/go-api-declarations v1.10.5/go.mod h1:83R3hTANhuRXt/pXDby37IJetw8l7DG41s33Tp9NXxI= +github.com/sapcc/go-bits v0.0.0-20231213211425-ddd5e41f8535 h1:spliyqfKEO+098p/TBNjNIhXoyCqj1Zf+pROsaoN9SQ= +github.com/sapcc/go-bits v0.0.0-20231213211425-ddd5e41f8535/go.mod h1:jsn7K60WbjIzXz5V38eeHP2SNsBsCpFOtbXOSsBZXoQ= +github.com/sapcc/gophercloud-sapcc v0.0.0-20231214091214-e4517ca1b6a4 h1:bPzqErdlvFN8KkZorXj0Js2bIMrSAt5oGdo65ncjnSM= +github.com/sapcc/gophercloud-sapcc v0.0.0-20231214091214-e4517ca1b6a4/go.mod h1:W7BMHKOIhBMtBOqCDBT4APx7A48q7wt9i0jPB0PDXLs= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= diff --git a/vendor/github.com/sapcc/go-api-declarations/limes/resources/metadata.go b/vendor/github.com/sapcc/go-api-declarations/limes/resources/metadata.go index ba5f1a53..df658946 100644 --- a/vendor/github.com/sapcc/go-api-declarations/limes/resources/metadata.go +++ b/vendor/github.com/sapcc/go-api-declarations/limes/resources/metadata.go @@ -55,7 +55,7 @@ type BurstingMultiplier float64 // ApplyTo returns the bursted backend quota for the given approved quota. func (m BurstingMultiplier) ApplyTo(quota uint64, qdModel QuotaDistributionModel) uint64 { switch qdModel { - case CentralizedQuotaDistribution: + case AutogrowQuotaDistribution: return quota case HierarchicalQuotaDistribution: return uint64(math.Floor((1 + float64(m)) * float64(quota))) @@ -82,13 +82,14 @@ const ( // projects by the domain admins. Domains and projects start out at zero // quota. HierarchicalQuotaDistribution QuotaDistributionModel = "hierarchical" - // CentralizedQuotaDistribution is an alternative QuotaDistributionModel, - // wherein quota is directly given to projects by the cloud admins. Projects - // start out at a generous default quota as configured by the Limes operator. - // The domain quota cannot be edited and is always reported equal to the - // projects quota. - CentralizedQuotaDistribution QuotaDistributionModel = "centralized" - // ^ NOTE: When removing this, also consider removing DefaultQuota from ProjectResourceReport. + // AutogrowQuotaDistribution is an alternative QuotaDistributionModel, + // wherein project quota is automatically distributed ("auto") such that: + // 1. all active commitments and usage are represented in their respective project quota, + // 2. there is some space beyond the current commitment/usage ("grow"). + // + // Domain quota is irrelevant under this model. Project quota never sinks + // below a certain value (the "base quota") unless capacity is exhausted. + AutogrowQuotaDistribution QuotaDistributionModel = "autogrow" ) // CommitmentConfiguration describes how commitments are configured for a given resource. diff --git a/vendor/github.com/sapcc/go-api-declarations/limes/resources/report_project.go b/vendor/github.com/sapcc/go-api-declarations/limes/resources/report_project.go index 6568c6cb..a26cffba 100644 --- a/vendor/github.com/sapcc/go-api-declarations/limes/resources/report_project.go +++ b/vendor/github.com/sapcc/go-api-declarations/limes/resources/report_project.go @@ -58,7 +58,6 @@ type ProjectResourceReport struct { //PerAZ is only rendered by Limes when the v2 API feature preview is enabled. PerAZ ProjectAZResourceReports `json:"per_az,omitempty"` Quota *uint64 `json:"quota,omitempty"` - DefaultQuota *uint64 `json:"default_quota,omitempty"` UsableQuota *uint64 `json:"usable_quota,omitempty"` Usage uint64 `json:"usage"` BurstUsage uint64 `json:"burst_usage,omitempty"` diff --git a/vendor/modules.txt b/vendor/modules.txt index bd7bc9e5..c210c4f5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -119,7 +119,7 @@ github.com/rabbitmq/amqp091-go # github.com/rs/cors v1.10.1 ## explicit; go 1.13 github.com/rs/cors -# github.com/sapcc/go-api-declarations v1.10.4 +# github.com/sapcc/go-api-declarations v1.10.5 ## explicit; go 1.21 github.com/sapcc/go-api-declarations/bininfo github.com/sapcc/go-api-declarations/cadf @@ -127,7 +127,7 @@ github.com/sapcc/go-api-declarations/castellum github.com/sapcc/go-api-declarations/internal/marshal github.com/sapcc/go-api-declarations/limes github.com/sapcc/go-api-declarations/limes/resources -# github.com/sapcc/go-bits v0.0.0-20231207102323-7b1f750ed23f +# github.com/sapcc/go-bits v0.0.0-20231213211425-ddd5e41f8535 ## explicit; go 1.21 github.com/sapcc/go-bits/assert github.com/sapcc/go-bits/audittools @@ -147,7 +147,7 @@ github.com/sapcc/go-bits/promquery github.com/sapcc/go-bits/regexpext github.com/sapcc/go-bits/respondwith github.com/sapcc/go-bits/sqlext -# github.com/sapcc/gophercloud-sapcc v0.0.0-20231207102321-ccb7578c58b1 +# github.com/sapcc/gophercloud-sapcc v0.0.0-20231214091214-e4517ca1b6a4 ## explicit; go 1.21 github.com/sapcc/gophercloud-sapcc/clients github.com/sapcc/gophercloud-sapcc/resources/v1/projects