Skip to content

Commit 858f274

Browse files
author
Rahul Sharma
committed
address review comments
1 parent 9f03d9a commit 858f274

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cloud/nodeipam/ipam/cloud_allocator.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,10 @@ func (c *cloudAllocator) occupyCIDRs(ctx context.Context, node *v1.Node) error {
304304
if err != nil {
305305
return fmt.Errorf("failed to parse node %s, CIDR %s", node.Name, cidr)
306306
}
307-
// IPv6 CIDRs are allocated from node specific ranges
307+
// IPv6 CIDRs are allocated from node-specific ranges
308308
// We don't track them in the cidrSet
309309
if podCIDR.IP.To4() == nil {
310-
logger.V(4).Info("Nothing to occupy for ipv6 CIDR", "cidr", podCIDR)
310+
logger.V(4).Info("Nothing to occupy for IPv6 CIDR", "cidr", podCIDR)
311311
return nil
312312
}
313313
// If node has a pre allocate cidr that does not exist in our cidrs.
@@ -430,7 +430,7 @@ func (c *cloudAllocator) ReleaseCIDR(logger klog.Logger, node *v1.Node) error {
430430
return fmt.Errorf("failed to parse CIDR %s on Node %v: %w", cidr, node.Name, err)
431431
}
432432
if podCIDR.IP.To4() == nil {
433-
logger.V(4).Info("Nothing to release for ipv6 CIDR", "cidr", podCIDR)
433+
logger.V(4).Info("Nothing to release for IPv6 CIDR", "cidr", podCIDR)
434434
continue
435435
}
436436

docs/configuration/environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The CCM supports the following flags:
5454
| `--node-cidr-mask-size-ipv4` | `24` | ipv4 cidr mask size for pod cidrs allocated to nodes |
5555
| `--node-cidr-mask-size-ipv6` | `64` | ipv6 cidr mask size for pod cidrs allocated to nodes |
5656
| `--nodebalancer-prefix` | `ccm` | Name prefix for NoadBalancers. |
57-
| `--disable-ipv6-node-cidr-allocation` | `false` | disables allocating ipv6 CIDR ranges to nodes when using CCM for node IPAM (set to `true` if ipv6 ranges are not configured on linode interfaces) |
57+
| `--disable-ipv6-node-cidr-allocation` | `false` | disables allocating IPv6 CIDR ranges to nodes when using CCM for node IPAM (set to `true` if IPv6 ranges are not configured on Linode interfaces) |
5858

5959
## Configuration Methods
6060

docs/configuration/nodeipam.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Note:
2121
Make sure node IPAM allocation is disabled in kube-controller-manager to avoid both controllers competing to assign CIDRs to nodes. To make sure its disabled, check and make sure kube-controller-manager is not started with `--allocate-node-cidrs` flag.
2222

2323
## Allocated subnet size
24-
By default, CCM allocates /24 subnet for ipv4 addresses and /112 for ipv6 addresses to nodes. For ipv6 cidr allocation using CCM, linodes should have ipv6 ranges configured on their interfaces. If one wants different subnet range, it can be configured by using `--node-cidr-mask-size-ipv4` and `--node-cidr-mask-size-ipv6` flags.
24+
By default, CCM allocates /24 subnet for IPv4 addresses and /112 for IPv6 addresses to nodes. For IPv6 CIDR allocation using CCM, linodes should have IPv6 ranges configured on their interfaces. If one wants different subnet range, it can be configured by using `--node-cidr-mask-size-ipv4` and `--node-cidr-mask-size-ipv6` flags.
2525

2626
```yaml
2727
spec:

0 commit comments

Comments
 (0)