use utils

kubernetes · Feb 27, 2019 · ab21a63 · ab21a63
1 parent ea40009
commit ab21a63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/model/openstackmodel/BUILD.bazel b/pkg/model/openstackmodel/BUILD.bazel
@@ -20,6 +20,7 @@ go_library(
         "//upup/pkg/fi/cloudup/openstack:go_default_library",
         "//upup/pkg/fi/cloudup/openstacktasks:go_default_library",
         "//upup/pkg/fi/fitasks:go_default_library",
+        "//util/pkg/slice:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
     ],
 )
diff --git a/pkg/model/openstackmodel/servergroup.go b/pkg/model/openstackmodel/servergroup.go
@@ -28,6 +28,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks"
 	"k8s.io/kops/upup/pkg/fi/fitasks"
+	"k8s.io/kops/util/pkg/slice"
 )
 
 // ServerGroupModelBuilder configures server group objects
@@ -73,13 +74,11 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
 		igUserData = fi.String(startupStr)
 	}
 
-	uniqueZones := make(map[string]string)
-	for _, subnet := range b.Cluster.Spec.Subnets {
-		uniqueZones[subnet.Zone] = ""
-	}
 	var zones []string
-	for k := range uniqueZones {
-		zones = append(zones, k)
+	for _, subnet := range b.Cluster.Spec.Subnets {
+		if !slice.Contains(zones, subnet.Zone) {
+			zones = append(zones, subnet.Zone)
+		}
 	}
 
 	// In the future, OpenStack will use Machine API to manage groups,