Skip to content

Commit

Permalink
Merge branch 'fix-podCIDR-allocation-logic' into 'main'
Browse files Browse the repository at this point in the history
fix: podCIDR allocation logic

See merge request cloudnative/go/cidr-allocator!30
  • Loading branch information
Michael Patsula committed Dec 9, 2024
2 parents 4d858ea + fae39a0 commit 6148f3e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions install/kubernetes/cidr-allocator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ keywords:
- Networking
- Node

version: 2.1.0
version: 2.1.1
kubeVersion: ">= 1.16.0-0"
appVersion: "v1.4.0"
appVersion: "v1.4.2"

maintainers:
- name: Ben Sykes
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/nodecidrallocation_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func (r *NodeCIDRAllocationReconciler) Reconcile(ctx context.Context, req ctrl.R
}

if !networkAllocated {
if node.Spec.PodCIDR != "" {
if node.Spec.PodCIDR == "" {
node.Spec.PodCIDR = subnet
allocatedSubnetInReconcile = append(allocatedSubnetInReconcile, subnet)

Expand Down

0 comments on commit 6148f3e

Please sign in to comment.