Merge pull request #5279 from qinqon/udn-fix-join-subnet-typo

udn: Fix NAD template for join subnets field

Author: tssurya

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

@@ -192,7 +192,7 @@ func renderCNINetworkConfig(networkName, nadName string, spec SpecGetter) (map[s
 		cniNetConf["mtu"] = mtu
 	}
 	if len(netConfSpec.JoinSubnet) > 0 {
-		cniNetConf["joinSubnets"] = netConfSpec.JoinSubnet
+		cniNetConf["joinSubnet"] = netConfSpec.JoinSubnet
 	}
 	if len(netConfSpec.Subnets) > 0 {
 		cniNetConf["subnets"] = netConfSpec.Subnets

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

@@ -326,7 +326,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 				"netAttachDefName": "mynamespace/test-net",
 				"role": "primary",
 				"topology": "layer3",
-				"joinSubnets": "100.65.0.0/16,fd99::/64",
+				"joinSubnet": "100.65.0.0/16,fd99::/64",
 				"subnets": "192.168.100.0/16,2001:dbb::/60",
 				"mtu": 1500
 			}`,
@@ -350,7 +350,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 			  "netAttachDefName": "mynamespace/test-net",
 			  "role": "primary",
 			  "topology": "layer2",
-			  "joinSubnets": "100.65.0.0/16,fd99::/64",
+			  "joinSubnet": "100.65.0.0/16,fd99::/64",
 			  "subnets": "192.168.100.0/24,2001:dbb::/64",
 			  "mtu": 1500,
 			  "allowPersistentIPs": true
@@ -376,7 +376,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 			  "netAttachDefName": "mynamespace/test-net",
 			  "role": "primary",
 			  "topology": "layer2",
-			  "joinSubnets": "100.62.0.0/24,fd92::/64",
+			  "joinSubnet": "100.62.0.0/24,fd92::/64",
 			  "subnets": "192.168.100.0/24,2001:dbb::/64",
 			  "mtu": 1500,
 			  "allowPersistentIPs": true
@@ -461,7 +461,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 				"netAttachDefName": "mynamespace/test-net",
 				"role": "primary",
 				"topology": "layer3",
-				"joinSubnets": "100.65.0.0/16,fd99::/64",
+				"joinSubnet": "100.65.0.0/16,fd99::/64",
 				"subnets": "192.168.100.0/16,2001:dbb::/60",
 				"mtu": 1500
 			}`,
@@ -485,7 +485,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 			  "netAttachDefName": "mynamespace/test-net",
 			  "role": "primary",
 			  "topology": "layer2",
-			  "joinSubnets": "100.65.0.0/16,fd99::/64",
+			  "joinSubnet": "100.65.0.0/16,fd99::/64",
 			  "subnets": "192.168.100.0/24,2001:dbb::/64",
 			  "mtu": 1500,
 			  "allowPersistentIPs": true
@@ -511,7 +511,7 @@ var _ = Describe("NetAttachDefTemplate", func() {
 			  "netAttachDefName": "mynamespace/test-net",
 			  "role": "primary",
 			  "topology": "layer2",
-			  "joinSubnets": "100.62.0.0/24,fd92::/64",
+			  "joinSubnet": "100.62.0.0/24,fd92::/64",
 			  "subnets": "192.168.100.0/24,2001:dbb::/64",
 			  "mtu": 1500,
 			  "allowPersistentIPs": true