Skip to content

Commit

Permalink
Merge pull request #20 from blakebarnett/bdb__limit_pod_list_by_names…
Browse files Browse the repository at this point in the history
…pace

Limit Pod.List calls by namespace
  • Loading branch information
seeker89 committed Dec 20, 2018
2 parents bfa78dc + 5bad429 commit 0060f82
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
@@ -1,5 +1,5 @@
name ?= goldpinger
version ?= 1.0.3
version ?= 1.1.0
bin ?= goldpinger
pkg ?= "github.com/bloomberg/goldpinger"
tag = $(name):$(version)
Expand Down
16 changes: 13 additions & 3 deletions pkg/goldpinger/k8s.go
Expand Up @@ -16,14 +16,24 @@ package goldpinger

import (
"log"

"io/ioutil"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func GetAllPods() map[string]string {
func getNamespace() string {
b, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
if err != nil {
log.Println("Unable to determine namespace: ", err.Error())
return ""
}
namespace := string(b)
return namespace
}

func GetAllPods() map[string]string {
timer := GetLabeledKubernetesCallsTimer()
pods, err := GoldpingerConfig.KubernetesClient.CoreV1().Pods("").List(metav1.ListOptions{LabelSelector: "app=goldpinger"})
namespace := getNamespace()
pods, err := GoldpingerConfig.KubernetesClient.CoreV1().Pods(namespace).List(metav1.ListOptions{LabelSelector: "app=goldpinger"})
if err != nil {
log.Println("Error getting pods for selector: ", err.Error())
CountError("kubernetes_api")
Expand Down

0 comments on commit 0060f82

Please sign in to comment.