Merge branch 'master' into abctaylor-serviceaccount

This commit is contained in:
ABC Taylor
2024-04-11 08:41:04 +01:00
committed by GitHub
3 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name ?= goldpinger
version ?= v3.7.0
version ?= v3.10.0
bin ?= goldpinger
pkg ?= "github.com/bloomberg/goldpinger"
tag = $(name):$(version)
+6
View File
@@ -20,10 +20,12 @@ import (
"io/ioutil"
"log"
"os"
"strings"
"time"
"github.com/go-openapi/loads"
"go.uber.org/zap"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
@@ -131,6 +133,10 @@ func main() {
if err != nil {
logger.Fatal("Error getting config ", zap.Error(err))
}
// communicate to kube-apiserver with protobuf
config.AcceptContentTypes = strings.Join([]string{runtime.ContentTypeProtobuf, runtime.ContentTypeJSON}, ",")
config.ContentType = runtime.ContentTypeProtobuf
// create the clientset
clientset, err := kubernetes.NewForConfig(config)
if err != nil {
+2
View File
@@ -107,6 +107,8 @@ func getPodNodeName(p v1.Pod) string {
func GetAllPods() map[string]*GoldpingerPod {
timer := GetLabeledKubernetesCallsTimer()
listOpts := metav1.ListOptions{
ResourceVersion: "0",
LabelSelector: GoldpingerConfig.LabelSelector,
FieldSelector: "status.phase=Running", // only select Running pods, otherwise we will get them before they have IPs
}