Merge pull request #53 from doitintl/issue-52

Add support for monitoring all node pools
doitintl · May 30, 2019 · 576fb60 · 576fb60
2 parents cfa5485 + 8edd004
commit 576fb60
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/deploy/kubeip-configmap.yaml b/deploy/kubeip-configmap.yaml
@@ -6,6 +6,7 @@ data:
   KUBEIP_FORCEASSIGNMENT: "true"
   KUBEIP_ADDITIONALNODEPOOLS: ""
   KUBEIP_TICKER: "5"
+  KUBEIP_ALLNODEPOOLS: "false"
 kind: ConfigMap
 metadata:
   labels:

diff --git a/deploy/kubeip-deployment.yaml b/deploy/kubeip-deployment.yaml
@@ -58,6 +58,12 @@ spec:
               configMapKeyRef:
                 key: "KUBEIP_TICKER"
                 name: "kubeip-config"
+          - name: "KUBEIP_ALLNODEPOOLS"
+            valueFrom:
+              configMapKeyRef:
+                key: "KUBEIP_ALLNODEPOOLS"
+                name: "kubeip-config"
+
 
 
           - name: GOOGLE_APPLICATION_CREDENTIALS

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -34,6 +34,7 @@ type Config struct {
 	ForceAssignment bool
 	AdditionalNodePools[] string
 	Ticker time.Duration
+	AllNodePools bool
 }
 
 func setConfigDefaults() {
@@ -44,6 +45,7 @@ func setConfigDefaults() {
 	viper.SetDefault("ForceAssignment", true)
 	viper.SetDefault("AdditionalNodePools", "")
 	viper.SetDefault("Ticker", 5)
+	viper.SetDefault("AllNodePools", false)
 }
 
 func NewConfig() (*Config, error) {
@@ -63,6 +65,7 @@ func NewConfig() (*Config, error) {
 		ForceAssignment: viper.GetBool("forceassignment"),
 		AdditionalNodePools: AdditionalNodePools,
 		Ticker:           viper.GetDuration("ticker"),
+		AllNodePools: viper.GetBool("allnodepools"),
 	}
 	return &c, nil
 }
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -209,6 +209,9 @@ func (c *Controller) processNextItem() bool {
 }
 
 func (c *Controller) isNodePollMonitored(pool string) bool {
+	if c.config.AllNodePools == true {
+		return true
+	}
 	if strings.ToLower(pool) == strings.ToLower(c.config.NodePool) {
 		return true
 	}