Merge pull request #50430 from x1957/glusterfs

Automatic merge from submit-queue remove the duplicate address of glusterfs **What this PR does / why we need it**: remove the duplicate endpoint address of glusterfs. If there is no duplicate address of user config or the duplicate address is ok, we can remove the unused addr map. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note None ```

Merge pull request #50430 from x1957/glusterfs
68c4fd30 · Kubernetes Submit Queue · GitHub · fc62da91 · cade629d · 68c4fd30
Commit 68c4fd30 authored Aug 11, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

BUILD pkg/volume/glusterfs/BUILD +1 -0

glusterfs.go pkg/volume/glusterfs/glusterfs.go +6 -3

No files found.
--- a/pkg/volume/glusterfs/BUILD
+++ b/pkg/volume/glusterfs/BUILD
@@ -33,6 +33,7 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
        "//vendor/k8s.io/utils/exec:go_default_library",
    ],

--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -35,6 +35,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
 	"k8s.io/kubernetes/pkg/util/mount"
@@ -322,12 +323,14 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
 	if b.hosts == nil {
 		return fmt.Errorf("glusterfs: endpoint is nil")
 	}
-	addr := make(map[string]struct{})
+	addr := sets.String{}
 	if b.hosts.Subsets != nil {
 		for _, s := range b.hosts.Subsets {
 			for _, a := range s.Addresses {
-				addr[a.IP] = struct{}{}
-				addrlist = append(addrlist, a.IP)
+				if !addr.Has(a.IP) {
+					addr.Insert(a.IP)
+					addrlist = append(addrlist, a.IP)
+				}
 			}
 		}