Merge pull request #739 from luoyunhe/bugfix

【fix】get pod attachment net
kubeovn · Apr 9, 2021 · a6a0183 · a6a0183
2 parents 8e9789f + f9ae625
commit a6a0183
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -782,15 +782,19 @@ type kubeovnNet struct {
 }
 
 func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
-	var wholeAttachNets string
-	attachNetworks := pod.Annotations[util.AttachmentNetworkAnnotation]
+	var networkList []string
+
 	defaultAttachNetworks := pod.Annotations[util.DefaultNetworkAnnotation]
 	if defaultAttachNetworks != "" {
-		wholeAttachNets = defaultAttachNetworks
+		networkList = append(networkList, defaultAttachNetworks)
 	}
+
+	attachNetworks := pod.Annotations[util.AttachmentNetworkAnnotation]
 	if attachNetworks != "" {
-		wholeAttachNets = wholeAttachNets + "," + attachNetworks
+		networkList = append(networkList, attachNetworks)
 	}
+
+	wholeAttachNets := strings.Join(networkList, ",")
 	if wholeAttachNets == "" {
 		return nil, nil
 	}