From c157292ecd6c076e1b2066c01d1ac40457aaa3aa Mon Sep 17 00:00:00 2001 From: mrWinston Date: Mon, 29 Jul 2024 14:54:09 +0200 Subject: [PATCH] Fix formatting --- pkg/util/azureclient/mgmt/network/subnets.go | 2 +- pkg/util/cluster/cluster.go | 39 +++++++++----------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pkg/util/azureclient/mgmt/network/subnets.go b/pkg/util/azureclient/mgmt/network/subnets.go index 61678697cae..ec51b67a544 100644 --- a/pkg/util/azureclient/mgmt/network/subnets.go +++ b/pkg/util/azureclient/mgmt/network/subnets.go @@ -15,7 +15,7 @@ import ( // SubnetsClient is a minimal interface for azure SubnetsClient type SubnetsClient interface { Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result mgmtnetwork.Subnet, err error) - List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result mgmtnetwork.SubnetListResultPage, err error) + List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result mgmtnetwork.SubnetListResultPage, err error) SubnetsClientAddons } diff --git a/pkg/util/cluster/cluster.go b/pkg/util/cluster/cluster.go index f15585f6109..589f8e80b90 100644 --- a/pkg/util/cluster/cluster.go +++ b/pkg/util/cluster/cluster.go @@ -67,7 +67,6 @@ type Cluster struct { vaultsClient armkeyvault.VaultsClient } - const GenerateSubnetMaxTries = 100 func New(log *logrus.Entry, environment env.Core, ci bool) (*Cluster, error) { @@ -205,10 +204,10 @@ func (c *Cluster) Create(ctx context.Context, vnetResourceGroup, clusterName str } addressPrefix, masterSubnet, workerSubnet, err := c.generateSubnets() - - if err != nil { - return err - } + + if err != nil { + return err + } var kvName string if len(vnetResourceGroup) > 10 { @@ -354,7 +353,7 @@ func (c *Cluster) Create(ctx context.Context, vnetResourceGroup, clusterName str } // ipRangesContainCIDR checks, weather any of the ipRanges overlap with the cidr string. In case cidr isn't valid, false is returned. -func ipRangesContainCIDR(ipRanges []*net.IPNet, cidr string) (bool, error){ +func ipRangesContainCIDR(ipRanges []*net.IPNet, cidr string) (bool, error) { _, cidrNet, err := net.ParseCIDR(cidr) if err != nil { return false, err @@ -394,7 +393,6 @@ func GetIPRangesFromSubnet(subnet mgmtnetwork.Subnet) []*net.IPNet { return ipRanges } - // getAllDevSubnets queries azure to retrieve all subnets assigned the vnet // `dev-vnet` in the current resource group func (c *Cluster) getAllDevSubnets() ([]mgmtnetwork.Subnet, error) { @@ -415,11 +413,10 @@ func (c *Cluster) getAllDevSubnets() ([]mgmtnetwork.Subnet, error) { return allSubnets, nil } - func (c *Cluster) generateSubnets() (vnetPrefix string, masterSubnet string, workerSubnet string, err error) { - // pick a random 23 in range [10.3.0.0, 10.127.255.0], making sure it doesn't - // conflict with other subnets present in out dev-vnet - // 10.0.0.0/16 is used by dev-vnet to host CI + // pick a random 23 in range [10.3.0.0, 10.127.255.0], making sure it doesn't + // conflict with other subnets present in out dev-vnet + // 10.0.0.0/16 is used by dev-vnet to host CI // 10.1.0.0/24 is used by rp-vnet to host Proxy VM // 10.2.0.0/24 is used by dev-vpn-vnet to host VirtualNetworkGateway @@ -433,7 +430,6 @@ func (c *Cluster) generateSubnets() (vnetPrefix string, masterSubnet string, wor ipRanges = append(ipRanges, GetIPRangesFromSubnet(snet)...) } - for i := 1; i < GenerateSubnetMaxTries; i++ { var x, y int // Local Dev clusters are limited to /16 dev-vnet @@ -447,23 +443,22 @@ func (c *Cluster) generateSubnets() (vnetPrefix string, masterSubnet string, wor masterSubnet = fmt.Sprintf("10.%d.%d.0/24", x, y) workerSubnet = fmt.Sprintf("10.%d.%d.0/24", x, y+1) - masterSubnetOverlaps, err := ipRangesContainCIDR(ipRanges, workerSubnet) - if err != nil || masterSubnetOverlaps { - continue - } + masterSubnetOverlaps, err := ipRangesContainCIDR(ipRanges, workerSubnet) + if err != nil || masterSubnetOverlaps { + continue + } - workerSubnetOverlaps, err := ipRangesContainCIDR(ipRanges, workerSubnet) - if err != nil || workerSubnetOverlaps { - continue - } + workerSubnetOverlaps, err := ipRangesContainCIDR(ipRanges, workerSubnet) + if err != nil || workerSubnetOverlaps { + continue + } return vnetPrefix, masterSubnet, workerSubnet, nil } - + return vnetPrefix, masterSubnet, workerSubnet, fmt.Errorf("was not able to generate master and worker subnets after %v tries", GenerateSubnetMaxTries) } - func (c *Cluster) Delete(ctx context.Context, vnetResourceGroup, clusterName string) error { c.log.Infof("Deleting cluster %s in resource group %s", clusterName, vnetResourceGroup) var errs []error