Merge pull request #54 from geekflyer/master

fix #52 for good
doitintl · Jun 2, 2019 · 9e6167f · 9e6167f
2 parents 576fb60 + 892df06
commit 9e6167f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -208,7 +208,7 @@ func (c *Controller) processNextItem() bool {
 	return true
 }
 
-func (c *Controller) isNodePollMonitored(pool string) bool {
+func (c *Controller) isNodePoolMonitored(pool string) bool {
 	if c.config.AllNodePools == true {
 		return true
 	}
@@ -252,7 +252,7 @@ func (c *Controller) processItem(newEvent Event) error {
 				var ok bool
 				if pool, ok = labels["cloud.google.com/gke-nodepool"]; ok {
 					logrus.Infof("Node pool found %s", pool)
-					if !c.isNodePollMonitored(pool) {
+					if !c.isNodePoolMonitored(pool) {
 						return nil
 					}
 				} else {
@@ -290,7 +290,7 @@ func (c *Controller) processAllNodes() {
 	for _, node := range nodelist.Items {
 		labels := node.GetLabels()
 		if pool, ok = labels["cloud.google.com/gke-nodepool"]; ok {
-			if !c.isNodePollMonitored(pool) {
+			if !c.isNodePoolMonitored(pool) {
 				continue
 			}
 		} else {

diff --git a/pkg/kipcompute/compute.go b/pkg/kipcompute/compute.go
@@ -86,7 +86,7 @@ func FindFreeAddress(projectID string, region string, pool string, config *cfg.C
 		return "", err
 	}
 	var filter string
-	if strings.ToLower(pool) == strings.ToLower(config.NodePool) {
+	if config.AllNodePools || strings.ToLower(pool) == strings.ToLower(config.NodePool) {
 		filter = "(labels." + config.LabelKey + "=" + config.LabelValue + ")" + " AND  (-labels." + config.LabelKey + "-node-pool:*)"
 	} else {
 		filter = "(labels." + config.LabelKey + "=" + config.LabelValue + ")" + " AND " + "(labels." + config.LabelKey + "-node-pool=" +pool + ")"