From 152cf3bbaa5f3f5cbc6d67a0171dddda40a4d9e3 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Mon, 7 Jun 2021 16:10:13 +0200 Subject: [PATCH 1/2] cmd: run pod informer Signed-off-by: Damien Grisonnet --- cmd/adapter/adapter.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 7262d61c..2f566cd4 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -214,7 +214,7 @@ func (cmd *PrometheusAdapter) makeExternalProvider(promClient prom.Client, stopC return emProvider, nil } -func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client) error { +func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client, stopCh <-chan struct{}) error { if cmd.metricsConfig.ResourceRules == nil { // bail if we don't have rules for setting things up return nil @@ -240,9 +240,10 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client) erro return err } - podInformer := informers.NewFilteredSharedInformerFactory(client, 0, corev1.NamespaceAll, func(options *metav1.ListOptions) { + podInformerFactory := informers.NewFilteredSharedInformerFactory(client, 0, corev1.NamespaceAll, func(options *metav1.ListOptions) { options.FieldSelector = "status.phase=Running" }) + podInformer := podInformerFactory.Core().V1().Pods() informer, err := cmd.Informers() if err != nil { @@ -254,10 +255,12 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client) erro return err } - if err := api.Install(provider, podInformer.Core().V1().Pods().Lister(), informer.Core().V1().Nodes().Lister(), server.GenericAPIServer); err != nil { + if err := api.Install(provider, podInformer.Lister(), informer.Core().V1().Nodes().Lister(), server.GenericAPIServer); err != nil { return err } + go podInformer.Informer().Run(stopCh) + return nil } @@ -324,7 +327,7 @@ func main() { } // attach resource metrics support, if it's needed - if err := cmd.addResourceMetricsAPI(promClient); err != nil { + if err := cmd.addResourceMetricsAPI(promClient, stopCh); err != nil { klog.Fatalf("unable to install resource metrics API: %v", err) } From 91b9b7afc274d6e637f2abfd1fd03da07320496b Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Mon, 7 Jun 2021 16:15:05 +0200 Subject: [PATCH 2/2] .travis.yml: update go version to 1.16 Signed-off-by: Damien Grisonnet --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e5ecf2e0..8712c76e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: -- '1.15' +- '1.16' sudo: required services: