From 15a377c2ab63fd142e9e294d917a22b8a5c32f45 Mon Sep 17 00:00:00 2001
From: Nick Sardo <nicksardo@google.com>
Date: Tue, 11 Jul 2017 16:38:07 -0700
Subject: [PATCH] Cleanup of several areas

---
 controllers/gce/backends/backends.go          |  1 +
 controllers/gce/instances/instances.go        | 27 ++++++++++++++-----
 .../gce/loadbalancers/loadbalancers.go        | 11 +++++---
 controllers/gce/utils/utils.go                |  2 --
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/controllers/gce/backends/backends.go b/controllers/gce/backends/backends.go
index 486cfabfc..b9f0d8eba 100644
--- a/controllers/gce/backends/backends.go
+++ b/controllers/gce/backends/backends.go
@@ -443,6 +443,7 @@ func (b *Backends) Status(name string) string {
 }
 
 func applyLegacyHCToHC(existing *compute.HttpHealthCheck, hc *healthchecks.HealthCheck) {
+	hc.Description = existing.Description
 	hc.CheckIntervalSec = existing.CheckIntervalSec
 	hc.HealthyThreshold = existing.HealthyThreshold
 	hc.Host = existing.Host
diff --git a/controllers/gce/instances/instances.go b/controllers/gce/instances/instances.go
index b49f7cd01..e3c9d2c83 100644
--- a/controllers/gce/instances/instances.go
+++ b/controllers/gce/instances/instances.go
@@ -63,7 +63,9 @@ func (i *Instances) Init(zl zoneLister) {
 // all of which have the exact same named port.
 func (i *Instances) AddInstanceGroup(name string, port int64) ([]*compute.InstanceGroup, *compute.NamedPort, error) {
 	igs := []*compute.InstanceGroup{}
-	namedPort := &compute.NamedPort{}
+	namedPort := &compute.NamedPort{Name: fmt.Sprintf("port%v", port), Port: port}
+
+	defer i.snapshotter.Add(name, struct{}{})
 
 	zones, err := i.ListZones()
 	if err != nil {
@@ -79,14 +81,25 @@ func (i *Instances) AddInstanceGroup(name string, port int64) ([]*compute.Instan
 			if err != nil {
 				return nil, nil, err
 			}
-		} else {
-			glog.V(3).Infof("Instance group %v already exists in zone %v, adding port %d to it", name, zone, port)
 		}
-		defer i.snapshotter.Add(name, struct{}{})
-		namedPort, err = i.cloud.AddPortToInstanceGroup(ig, port)
-		if err != nil {
-			return nil, nil, err
+
+		found := false
+		for _, np := range ig.NamedPorts {
+			if np.Name == namedPort.Name && np.Port == namedPort.Port {
+				glog.V(3).Infof("Instance group %v/%v already has named port %+v", zone, name, np)
+				found = true
+				break
+			}
 		}
+
+		if !found {
+			glog.V(3).Infof("Adding port %d to instance group %v/%v", port, zone, name)
+			namedPort, err = i.cloud.AddPortToInstanceGroup(ig, port)
+			if err != nil {
+				return nil, nil, err
+			}
+		}
+
 		igs = append(igs, ig)
 	}
 	return igs, namedPort, nil
diff --git a/controllers/gce/loadbalancers/loadbalancers.go b/controllers/gce/loadbalancers/loadbalancers.go
index c3201f99f..b1dcb60b2 100644
--- a/controllers/gce/loadbalancers/loadbalancers.go
+++ b/controllers/gce/loadbalancers/loadbalancers.go
@@ -163,7 +163,7 @@ func (l *L7s) Delete(name string) error {
 
 // Sync loadbalancers with the given runtime info from the controller.
 func (l *L7s) Sync(lbs []*L7RuntimeInfo) error {
-	glog.V(3).Infof("Creating loadbalancers %+v", lbs)
+	glog.V(3).Infof("Syncing loadbalancers %v", lbs)
 
 	if len(lbs) != 0 {
 		// Lazily create a default backend so we don't tax users who don't care
@@ -257,6 +257,11 @@ type L7RuntimeInfo struct {
 	StaticIPName string
 }
 
+// String returns the load balancer name
+func (l *L7RuntimeInfo) String() string {
+	return l.Name
+}
+
 // L7 represents a single L7 loadbalancer.
 type L7 struct {
 	Name string
@@ -757,7 +762,6 @@ func (l *L7) UpdateUrlMap(ingressRules utils.GCEURLMap) error {
 	if l.um == nil {
 		return fmt.Errorf("cannot add url without an urlmap")
 	}
-	glog.V(3).Infof("Updating urlmap for l7 %v", l.Name)
 
 	// All UrlMaps must have a default backend. If the Ingress has a default
 	// backend, it applies to all host rules as well as to the urlmap itself.
@@ -807,7 +811,8 @@ func (l *L7) UpdateUrlMap(ingressRules utils.GCEURLMap) error {
 		glog.Infof("UrlMap for l7 %v is unchanged", l.Name)
 		return nil
 	}
-	glog.Infof("Updating url map: %+v", ingressRules)
+
+	glog.V(3).Infof("Updating URLMap: %q", l.Name)
 	um, err := l.cloud.UpdateUrlMap(l.um)
 	if err != nil {
 		return err
diff --git a/controllers/gce/utils/utils.go b/controllers/gce/utils/utils.go
index ec35f7412..237943a3a 100644
--- a/controllers/gce/utils/utils.go
+++ b/controllers/gce/utils/utils.go
@@ -191,7 +191,6 @@ func (n *Namer) ParseName(name string) *NameComponents {
 // NameBelongsToCluster checks if a given name is tagged with this cluster's UID.
 func (n *Namer) NameBelongsToCluster(name string) bool {
 	if !strings.HasPrefix(name, "k8s-") {
-		glog.V(4).Infof("%v not part of cluster", name)
 		return false
 	}
 	parts := strings.Split(name, clusterNameDelimiter)
@@ -203,7 +202,6 @@ func (n *Namer) NameBelongsToCluster(name string) bool {
 		return false
 	}
 	if len(parts) > 2 {
-		glog.Warningf("Too many parts to name %v, ignoring", name)
 		return false
 	}
 	return parts[1] == clusterName