Skip to content

Commit 0b613e3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2642 from jluhrsen/4.19-sync-from-4.20-06-18-2025
[release-4.19] OCPBUGS-59106: DownStream Merge Sync from 4.20 [06-18-2025]
2 parents 0c8cdc9 + 318d5bc commit 0b613e3

File tree

77 files changed

+2324
-1682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2324
-1682
lines changed

‎.github/workflows/test.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ jobs:
200200
if: steps.is_pr_image_build_needed.outputs.PR_IMAGE_RESTORED != 'true' && success()
201201
run: |
202202
set -x
203+
sudo apt update
203204
sudo apt-get install linux-modules-extra-$(uname -r) -y
204205
sudo modprobe vrf
205206
@@ -463,15 +464,15 @@ jobs:
463464
- {"target": "network-segmentation", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv4", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones"}
464465
- {"target": "network-segmentation", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv6", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones"}
465466
- {"target": "bgp", "ha": "noHA", "gateway-mode": "local", "ipfamily": "dualstack", "disable-snat-multiple-gws": "snatGW", "second-bridge": "1br", "ic": "ic-single-node-zones", "routeadvertisements": "advertise-default", "network-segmentation": "enable-network-segmentation"}
466-
- {"target": "bgp", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv4", "disable-snat-multiple-gws": "snatGW", "second-bridge": "1br", "ic": "ic-single-node-zones", "routeadvertisements": "advertise-default", "network-segmentation": "enable-network-segmentation"}
467+
- {"target": "bgp", "ha": "noHA", "gateway-mode": "shared", "ipfamily": "dualstack", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones", "routeadvertisements": "advertise-default", "network-segmentation": "enable-network-segmentation"}
467468
- {"target": "traffic-flow-test-only","ha": "noHA", "gateway-mode": "shared", "ipfamily": "ipv4", "disable-snat-multiple-gws": "noSnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones", "traffic-flow-tests": "1-24", "network-segmentation": "enable-network-segmentation"}
468469
- {"target": "tools", "ha": "noHA", "gateway-mode": "local", "ipfamily": "dualstack", "disable-snat-multiple-gws": "SnatGW", "second-bridge": "1br", "ic": "ic-single-node-zones", "network-segmentation": "enable-network-segmentation"}
469470
needs: [ build-pr ]
470471
env:
471472
JOB_NAME: "${{ matrix.target }}-${{ matrix.ha }}-${{ matrix.gateway-mode }}-${{ matrix.ipfamily }}-${{ matrix.disable-snat-multiple-gws }}-${{ matrix.second-bridge }}-${{ matrix.ic }}"
472473
OVN_HYBRID_OVERLAY_ENABLE: ${{ (matrix.target == 'control-plane' || matrix.target == 'control-plane-helm') && (matrix.ipfamily == 'ipv4' || matrix.ipfamily == 'dualstack' ) }}
473-
OVN_MULTICAST_ENABLE: "${{ matrix.target == 'control-plane' || matrix.target == 'control-plane-helm' || matrix.target == 'network-segmentation' }}"
474-
OVN_EMPTY_LB_EVENTS: "${{ matrix.target == 'control-plane' || matrix.target == 'control-plane-helm' }}"
474+
OVN_MULTICAST_ENABLE: "${{ matrix.target == 'control-plane' || matrix.target == 'control-plane-helm' || matrix.target == 'network-segmentation' || matrix.target == 'bgp' }}"
475+
OVN_EMPTY_LB_EVENTS: "${{ matrix.target == 'control-plane' || matrix.target == 'control-plane-helm' || matrix.target == 'bgp' }}"
475476
OVN_HA: "${{ matrix.ha == 'HA' }}"
476477
OVN_DISABLE_SNAT_MULTIPLE_GWS: "${{ matrix.disable-snat-multiple-gws == 'noSnatGW' }}"
477478
KIND_INSTALL_METALLB: "${{ matrix.target == 'control-plane' || matrix.target == 'control-plane-helm' || matrix.target == 'network-segmentation' }}"
@@ -500,6 +501,7 @@ jobs:
500501
- name: Install VRF kernel module
501502
run: |
502503
set -x
504+
sudo apt update
503505
sudo apt-get install linux-modules-extra-$(uname -r) -y
504506
sudo modprobe vrf
505507
@@ -557,7 +559,7 @@ jobs:
557559
echo OVN_TEST_EX_GW_NETWORK=xgw >> $GITHUB_ENV
558560
echo OVN_ENABLE_EX_GW_NETWORK_BRIDGE=true >> $GITHUB_ENV
559561
fi
560-
if [[ "$JOB_NAME" == *"shard-conformance"* ]] && [ "$ADVERTISE_DEFAULT_NETWORK" == "true" ]; then
562+
if [ "$ADVERTISE_DEFAULT_NETWORK" == "true" ]; then
561563
echo "ADVERTISE_DEFAULT_NETWORK=true" >> $GITHUB_ENV
562564
563565
# Use proper variable declaration with default values
@@ -614,7 +616,9 @@ jobs:
614616
- name: Run Tests
615617
# e2e tests take ~60 minutes normally, 120 should be more than enough
616618
# set 3 hours for control-plane tests as these might take a while
617-
timeout-minutes: ${{ matrix.target == 'control-plane' && 180 || matrix.target == 'control-plane-helm' && 180 || matrix.target == 'external-gateway' && 180 || 120 }}
619+
# give 10m extra to give ginkgo chance to timeout before github so that we
620+
# get its output
621+
timeout-minutes: ${{ matrix.target == 'bgp' && 190 || matrix.target == 'control-plane' && 190 || matrix.target == 'control-plane-helm' && 190 || matrix.target == 'external-gateway' && 190 || 130 }}
618622
run: |
619623
# used by e2e diagnostics package
620624
export OVN_IMAGE="ovn-daemonset-fedora:pr"
@@ -639,7 +643,7 @@ jobs:
639643
elif [ "${{ matrix.target }}" == "network-segmentation" ]; then
640644
make -C test control-plane WHAT="Network Segmentation"
641645
elif [ "${{ matrix.target }}" == "bgp" ]; then
642-
make -C test control-plane WHAT="BGP"
646+
make -C test control-plane
643647
elif [ "${{ matrix.target }}" == "tools" ]; then
644648
make -C go-controller build
645649
make -C test tools

‎contrib/kind-common‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,13 @@ deploy_bgp_external_server() {
751751
echo "FRR kind network IPv6: ${bgp_network_frr_v6}"
752752
$OCI_BIN exec bgpserver ip -6 route replace default via "$bgp_network_frr_v6"
753753
fi
754+
# disable the default route to make sure the container only routes accross
755+
# directly connected or learnt networks (doing this at the very end since
756+
# docker changes the routing table when a new network is connected)
757+
docker exec frr ip route delete default
758+
docker exec frr ip route
759+
docker exec frr ip -6 route delete default
760+
docker exec frr ip -6 route
754761
}
755762

756763
destroy_bgp() {
@@ -817,7 +824,7 @@ EOF
817824

818825
rm -rf "${FRR_TMP_DIR}"
819826
# Add routes for pod networks dynamically into the github runner for return traffic to pass back
820-
if [ -n "${JOB_NAME:-}" ] && [[ "$JOB_NAME" == *"shard-conformance"* ]] && [ "$ADVERTISE_DEFAULT_NETWORK" == "true" ]; then
827+
if [ "$ADVERTISE_DEFAULT_NETWORK" = "true" ]; then
821828
echo "Adding routes for Kubernetes pod networks..."
822829
NODES=$(kubectl get nodes -o jsonpath='{.items[*].metadata.name}')
823830
echo "Found nodes: $NODES"
@@ -835,7 +842,7 @@ EOF
835842
# Add IPv4 route
836843
if [ -n "$ipv4_subnet" ] && [ -n "$node_ipv4" ]; then
837844
echo "Adding IPv4 route for $node ($node_ipv4): $ipv4_subnet"
838-
sudo ip route add $ipv4_subnet via $node_ipv4
845+
sudo ip route replace $ipv4_subnet via $node_ipv4
839846
fi
840847
fi
841848

@@ -847,7 +854,7 @@ EOF
847854

848855
if [ -n "$ipv6_subnet" ] && [ -n "$node_ipv6" ]; then
849856
echo "Adding IPv6 route for $node ($node_ipv6): $ipv6_subnet"
850-
sudo ip -6 route add $ipv6_subnet via $node_ipv6
857+
sudo ip -6 route replace $ipv6_subnet via $node_ipv6
851858
fi
852859
fi
853860
done

‎go-controller/hybrid-overlay/pkg/controller/ho_node_windows.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func newNodeController(kube kube.Interface,
5757
"UDP port. Please make sure you install all the KB updates on your system.")
5858
}
5959

60-
node, err := kube.GetNode(nodeName)
60+
node, err := kube.GetNodeForWindows(nodeName)
6161
if err != nil {
6262
return nil, err
6363
}
@@ -345,7 +345,7 @@ func (n *NodeController) initSelf(node *corev1.Node, nodeSubnet *net.IPNet) erro
345345
}
346346

347347
// Add existing nodes
348-
nodes, err := n.kube.GetNodes()
348+
nodes, err := n.kube.GetNodesForWindows()
349349
if err != nil {
350350
return fmt.Errorf("error in initializing/fetching nodes: %v", err)
351351
}
@@ -370,7 +370,7 @@ func (n *NodeController) uninitSelf(node *corev1.Node) error {
370370
networkName, n.networkID, node.Name)
371371

372372
// Remove existing nodes
373-
nodes, err := n.kube.GetNodes()
373+
nodes, err := n.kube.GetNodesForWindows()
374374
if err != nil {
375375
return fmt.Errorf("failed to get nodes: %v", err)
376376
}

‎go-controller/hybrid-overlay/pkg/controller/ovn_node_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func (n *NodeController) AddNode(node *corev1.Node) error {
261261
} else {
262262
// Make sure the local node has been initialized before adding a hybridOverlay remote node
263263
if atomic.LoadUint32(n.initState) < hotypes.DistributedRouterInitialized {
264-
localNode, err := n.kube.GetNode(n.nodeName)
264+
localNode, err := n.nodeLister.Get(n.nodeName)
265265
if err != nil {
266266
return fmt.Errorf("cannot get local node: %s: %w", n.nodeName, err)
267267
}

‎go-controller/pkg/clustermanager/network_cluster_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ func (ncc *networkClusterController) Reconcile(netInfo util.NetInfo) error {
475475
klog.Errorf("Failed to reconcile network %s: %v", ncc.GetNetworkName(), err)
476476
}
477477
if reconcilePendingPods && ncc.retryPods != nil {
478-
if err := objretry.RequeuePendingPods(ncc.kube, ncc.GetNetInfo(), ncc.retryPods); err != nil {
478+
if err := objretry.RequeuePendingPods(ncc.watchFactory, ncc.GetNetInfo(), ncc.retryPods); err != nil {
479479
klog.Errorf("Failed to requeue pending pods for network %s: %v", ncc.GetNetworkName(), err)
480480
}
481481
}
@@ -576,7 +576,7 @@ func (h *networkClusterControllerEventHandler) UpdateResource(oldObj, newObj int
576576
// 1. we missed an add event (bug in kapi informer code)
577577
// 2. a user removed the annotation on the node
578578
// Either way to play it safe for now do a partial json unmarshal check
579-
if !nodeFailed && util.NoHostSubnet(oldNode) != util.NoHostSubnet(newNode) && !h.ncc.nodeAllocator.NeedsNodeAllocation(newNode) {
579+
if !nodeFailed && util.NoHostSubnet(oldNode) == util.NoHostSubnet(newNode) && !h.ncc.nodeAllocator.NeedsNodeAllocation(newNode) {
580580
// no other node updates would require us to reconcile again
581581
return nil
582582
}

‎go-controller/pkg/clustermanager/node/node_allocator.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,27 +195,24 @@ func (na *NodeAllocator) NeedsNodeAllocation(node *corev1.Node) bool {
195195
}
196196

197197
// ovn node check
198-
// allocation is all or nothing, so if one field was allocated from:
199-
// nodeSubnets, joinSubnet, layer 2 tunnel id, then all of them were
200198
if na.hasNodeSubnetAllocation() {
201-
if util.HasNodeHostSubnetAnnotation(node, na.netInfo.GetNetworkName()) {
202-
return false
199+
if !util.HasNodeHostSubnetAnnotation(node, na.netInfo.GetNetworkName()) {
200+
return true
203201
}
204202
}
205-
206203
if na.hasJoinSubnetAllocation() {
207-
if util.HasNodeGatewayRouterJoinNetwork(node, na.netInfo.GetNetworkName()) {
208-
return false
204+
if !util.HasNodeGatewayRouterJoinNetwork(node, na.netInfo.GetNetworkName()) {
205+
return true
209206
}
210207
}
211208

212209
if util.IsNetworkSegmentationSupportEnabled() && na.netInfo.IsPrimaryNetwork() && util.DoesNetworkRequireTunnelIDs(na.netInfo) {
213-
if util.HasUDNLayer2NodeGRLRPTunnelID(node, na.netInfo.GetNetworkName()) {
214-
return false
210+
if !util.HasUDNLayer2NodeGRLRPTunnelID(node, na.netInfo.GetNetworkName()) {
211+
return true
215212
}
216213
}
217214

218-
return true
215+
return false
219216

220217
}
221218

‎go-controller/pkg/clustermanager/userdefinednetwork/template/net-attach-def-template.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func renderCNINetworkConfig(networkName, nadName string, spec SpecGetter) (map[s
192192
cniNetConf["mtu"] = mtu
193193
}
194194
if len(netConfSpec.JoinSubnet) > 0 {
195-
cniNetConf["joinSubnets"] = netConfSpec.JoinSubnet
195+
cniNetConf["joinSubnet"] = netConfSpec.JoinSubnet
196196
}
197197
if len(netConfSpec.Subnets) > 0 {
198198
cniNetConf["subnets"] = netConfSpec.Subnets

‎go-controller/pkg/clustermanager/userdefinednetwork/template/net-attach-def-template_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
326326
"netAttachDefName": "mynamespace/test-net",
327327
"role": "primary",
328328
"topology": "layer3",
329-
"joinSubnets": "100.65.0.0/16,fd99::/64",
329+
"joinSubnet": "100.65.0.0/16,fd99::/64",
330330
"subnets": "192.168.100.0/16,2001:dbb::/60",
331331
"mtu": 1500
332332
}`,
@@ -350,7 +350,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
350350
"netAttachDefName": "mynamespace/test-net",
351351
"role": "primary",
352352
"topology": "layer2",
353-
"joinSubnets": "100.65.0.0/16,fd99::/64",
353+
"joinSubnet": "100.65.0.0/16,fd99::/64",
354354
"subnets": "192.168.100.0/24,2001:dbb::/64",
355355
"mtu": 1500,
356356
"allowPersistentIPs": true
@@ -376,7 +376,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
376376
"netAttachDefName": "mynamespace/test-net",
377377
"role": "primary",
378378
"topology": "layer2",
379-
"joinSubnets": "100.62.0.0/24,fd92::/64",
379+
"joinSubnet": "100.62.0.0/24,fd92::/64",
380380
"subnets": "192.168.100.0/24,2001:dbb::/64",
381381
"mtu": 1500,
382382
"allowPersistentIPs": true
@@ -461,7 +461,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
461461
"netAttachDefName": "mynamespace/test-net",
462462
"role": "primary",
463463
"topology": "layer3",
464-
"joinSubnets": "100.65.0.0/16,fd99::/64",
464+
"joinSubnet": "100.65.0.0/16,fd99::/64",
465465
"subnets": "192.168.100.0/16,2001:dbb::/60",
466466
"mtu": 1500
467467
}`,
@@ -485,7 +485,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
485485
"netAttachDefName": "mynamespace/test-net",
486486
"role": "primary",
487487
"topology": "layer2",
488-
"joinSubnets": "100.65.0.0/16,fd99::/64",
488+
"joinSubnet": "100.65.0.0/16,fd99::/64",
489489
"subnets": "192.168.100.0/24,2001:dbb::/64",
490490
"mtu": 1500,
491491
"allowPersistentIPs": true
@@ -511,7 +511,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
511511
"netAttachDefName": "mynamespace/test-net",
512512
"role": "primary",
513513
"topology": "layer2",
514-
"joinSubnets": "100.62.0.0/24,fd92::/64",
514+
"joinSubnet": "100.62.0.0/24,fd92::/64",
515515
"subnets": "192.168.100.0/24,2001:dbb::/64",
516516
"mtu": 1500,
517517
"allowPersistentIPs": true

‎go-controller/pkg/config/config.go‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ const DefaultVXLANPort = 4789
3838

3939
const DefaultDBTxnTimeout = time.Second * 100
4040

41+
// DefaultEphemeralPortRange is used for unit testing only
42+
const DefaultEphemeralPortRange = "32768-60999"
43+
4144
// The following are global config parameters that other modules may access directly
4245
var (
4346
// Build information. Populated at build-time.
@@ -494,6 +497,10 @@ type GatewayConfig struct {
494497
DisableForwarding bool `gcfg:"disable-forwarding"`
495498
// AllowNoUplink (disabled by default) controls if the external gateway bridge without an uplink port is allowed in local gateway mode.
496499
AllowNoUplink bool `gcfg:"allow-no-uplink"`
500+
// EphemeralPortRange is the range of ports used by egress SNAT operations in OVN. Specifically for NAT where
501+
// the source IP of the NAT will be a shared Node IP address. If unset, the value will be determined by sysctl lookup
502+
// for the kernel's ephemeral range: net.ipv4.ip_local_port_range. Format is "<min port>-<max port>".
503+
EphemeralPortRange string `gfcg:"ephemeral-port-range"`
497504
}
498505

499506
// OvnAuthConfig holds client authentication and location details for
@@ -664,6 +671,9 @@ func PrepareTestConfig() error {
664671
Kubernetes.DisableRequestedChassis = false
665672
EnableMulticast = false
666673
Default.OVSDBTxnTimeout = 5 * time.Second
674+
if Gateway.Mode != GatewayModeDisabled {
675+
Gateway.EphemeralPortRange = DefaultEphemeralPortRange
676+
}
667677

668678
if err := completeConfig(); err != nil {
669679
return err
@@ -1509,6 +1519,14 @@ var OVNGatewayFlags = []cli.Flag{
15091519
Usage: "Allow the external gateway bridge without an uplink port in local gateway mode",
15101520
Destination: &cliConfig.Gateway.AllowNoUplink,
15111521
},
1522+
&cli.StringFlag{
1523+
Name: "ephemeral-port-range",
1524+
Usage: "The port range in '<min port>-<max port>' format for OVN to use when SNAT'ing to a node IP. " +
1525+
"This range should not collide with the node port range being used in Kubernetes. If not provided, " +
1526+
"the default value will be derived from checking the sysctl value of net.ipv4.ip_local_port_range on the node.",
1527+
Destination: &cliConfig.Gateway.EphemeralPortRange,
1528+
Value: Gateway.EphemeralPortRange,
1529+
},
15121530
// Deprecated CLI options
15131531
&cli.BoolFlag{
15141532
Name: "init-gateways",
@@ -1917,6 +1935,19 @@ func buildGatewayConfig(ctx *cli.Context, cli, file *config) error {
19171935
if !found {
19181936
return fmt.Errorf("invalid gateway mode %q: expect one of %s", string(Gateway.Mode), strings.Join(validModes, ","))
19191937
}
1938+
1939+
if len(Gateway.EphemeralPortRange) > 0 {
1940+
if !isValidEphemeralPortRange(Gateway.EphemeralPortRange) {
1941+
return fmt.Errorf("invalid ephemeral-port-range, should be in the format <min port>-<max port>")
1942+
}
1943+
} else {
1944+
// auto-detect ephermal range
1945+
portRange, err := getKernelEphemeralPortRange()
1946+
if err != nil {
1947+
return fmt.Errorf("unable to auto-detect ephemeral port range to use with OVN")
1948+
}
1949+
Gateway.EphemeralPortRange = portRange
1950+
}
19201951
}
19211952

19221953
// Options are only valid if Mode is not disabled
@@ -1927,6 +1958,9 @@ func buildGatewayConfig(ctx *cli.Context, cli, file *config) error {
19271958
if Gateway.NextHop != "" {
19281959
return fmt.Errorf("gateway next-hop option %q not allowed when gateway is disabled", Gateway.NextHop)
19291960
}
1961+
if len(Gateway.EphemeralPortRange) > 0 {
1962+
return fmt.Errorf("gateway ephemeral port range option not allowed when gateway is disabled")
1963+
}
19301964
}
19311965

19321966
if Gateway.Mode != GatewayModeShared && Gateway.VLANID != 0 {

‎go-controller/pkg/config/utils.go‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package config
33
import (
44
"fmt"
55
"net"
6+
"os"
67
"reflect"
8+
"regexp"
79
"strconv"
810
"strings"
911

@@ -328,3 +330,49 @@ func AllocateV6MasqueradeIPs(masqueradeSubnetNetworkAddress net.IP, masqueradeIP
328330
}
329331
return nil
330332
}
333+
334+
func isValidEphemeralPortRange(s string) bool {
335+
// Regex to match "<number>-<number>" with no extra characters
336+
re := regexp.MustCompile(`^(\d{1,5})-(\d{1,5})$`)
337+
matches := re.FindStringSubmatch(s)
338+
if matches == nil {
339+
return false
340+
}
341+
342+
minPort, err1 := strconv.Atoi(matches[1])
343+
maxPort, err2 := strconv.Atoi(matches[2])
344+
if err1 != nil || err2 != nil {
345+
return false
346+
}
347+
348+
// Port numbers must be in the 1-65535 range
349+
if minPort < 1 || minPort > 65535 || maxPort < 0 || maxPort > 65535 {
350+
return false
351+
}
352+
353+
return maxPort > minPort
354+
}
355+
356+
func getKernelEphemeralPortRange() (string, error) {
357+
data, err := os.ReadFile("/proc/sys/net/ipv4/ip_local_port_range")
358+
if err != nil {
359+
return "", fmt.Errorf("failed to read port range: %w", err)
360+
}
361+
362+
parts := strings.Fields(string(data))
363+
if len(parts) != 2 {
364+
return "", fmt.Errorf("unexpected format: %q", string(data))
365+
}
366+
367+
minPort, err := strconv.Atoi(parts[0])
368+
if err != nil {
369+
return "", fmt.Errorf("invalid min port: %w", err)
370+
}
371+
372+
maxPort, err := strconv.Atoi(parts[1])
373+
if err != nil {
374+
return "", fmt.Errorf("invalid max port: %w", err)
375+
}
376+
377+
return fmt.Sprintf("%d-%d", minPort, maxPort), nil
378+
}

0 commit comments

Comments
 (0)