From 92f370181b38ead1e01b0ba3dded57f4e2cf07f4 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 4 Aug 2021 09:41:07 -0400 Subject: [PATCH] Bug 1987845: openstack: relax quotas with Kuryr We missed Kuryr when we relaxed networking quotas and decremented the minimal constraints. --- pkg/asset/quota/openstack/openstack.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/asset/quota/openstack/openstack.go b/pkg/asset/quota/openstack/openstack.go index 2651088d34..e026f3bd59 100644 --- a/pkg/asset/quota/openstack/openstack.go +++ b/pkg/asset/quota/openstack/openstack.go @@ -17,7 +17,7 @@ import ( // Number of ports, routers, subnets and routers here don't include the constraints needed // for each machine, which are calculated later var minNetworkConstraint = buildNetworkConstraint(9, 0, 0, 0, 3, 60) -var minNetworkConstraintWithKuryr = buildNetworkConstraint(1494, 1, 250, 250, 250, 1000) +var minNetworkConstraintWithKuryr = buildNetworkConstraint(1494, 0, 249, 249, 250, 1000) func buildNetworkConstraint(ports, routers, subnets, networks, securityGroups, securityGroupRules int64) []quota.Constraint { return []quota.Constraint{ @@ -57,9 +57,7 @@ func Constraints(ci *validation.CloudInfo, controlPlanes []machineapi.Machine, c // If the cluster is using pre-provisioned networks, then the quota constraints should be // null because the installer doesn't need to create any resources. if ci.MachinesSubnet == nil { - if networkType != string(operv1.NetworkTypeKuryr) { - constraints = append(constraints, networkConstraint(1), routerConstraint(1), subnetConstraint(1)) - } + constraints = append(constraints, networkConstraint(1), routerConstraint(1), subnetConstraint(1)) } return aggregate(constraints)