From 4a118e968ce114ef90d218520927494ea694d369 Mon Sep 17 00:00:00 2001
From: Mengdie Song <songm@vmware.com>
Date: Thu, 27 Aug 2020 09:38:02 +0800
Subject: [PATCH] [IPv6] Handle Spec.PodCIDR with IPv6 CIDR (#1151)

For IPv6 single stack case, node.Spec.PodCIDR is
configured with IPv6 CIDR. This patch handles the case
and sets nodeConfig.PodIPv6CIDR with parsed CIDR.
---
 pkg/agent/agent.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
index c695dc8ab74..bf1f496f1ac 100644
--- a/pkg/agent/agent.go
+++ b/pkg/agent/agent.go
@@ -631,7 +631,11 @@ func (i *Initializer) initNodeLocalConfig() error {
 		klog.Errorf("Failed to parse subnet from CIDR string %s: %v", node.Spec.PodCIDR, err)
 		return err
 	}
-	i.nodeConfig.PodIPv4CIDR = localSubnet
+	if localSubnet.IP.To4() != nil {
+		i.nodeConfig.PodIPv4CIDR = localSubnet
+	} else {
+		i.nodeConfig.PodIPv6CIDR = localSubnet
+	}
 	return nil
 }