From 5633ed434aa77df6c91f15b3c847093647ac439e Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Mon, 9 Sep 2019 15:32:18 +0200 Subject: [PATCH] Reorganize imports in main.go, add warning level to metrics logs --- cmd/manager/main.go | 22 ++++++++----------- ...a59390ea2e0f21481eafe4022de05a44eba88fc.js | 5 ----- ...a62a1b7c40ef1a656c462c09a03c20d5cfbb057.js | 5 ----- 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 docs/js/main.min.15ba3b50c3bd013e1b26793d1a59390ea2e0f21481eafe4022de05a44eba88fc.js delete mode 100644 docs/js/main.min.e5ae77169eed324fae314e8a3a62a1b7c40ef1a656c462c09a03c20d5cfbb057.js diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 8e2ff19c..663ef71f 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -4,10 +4,6 @@ import ( "context" "flag" "fmt" - kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics" - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/rest" "os" "runtime" @@ -31,6 +27,10 @@ import ( "github.com/spf13/pflag" "k8s.io/client-go/kubernetes" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" + kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics" + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/runtime/signals" @@ -124,7 +124,7 @@ func main() { } if err = serveCRMetrics(cfg); err != nil { - log.Log.Info("Could not generate and serve custom resource metrics", "error", err.Error()) + log.Log.V(log.VWarn).Info("Could not generate and serve custom resource metrics", "error", err.Error()) } // Add to the below struct any other metrics ports you want to expose. @@ -135,7 +135,7 @@ func main() { // Create Service object to expose the metrics port(s). service, err := metrics.CreateMetricsService(ctx, cfg, servicePorts) if err != nil { - log.Log.Info("Could not create metrics Service", "error", err.Error()) + log.Log.V(log.VWarn).Info("Could not create metrics Service", "error", err.Error()) } // CreateServiceMonitors will automatically create the prometheus-operator ServiceMonitor resources @@ -143,11 +143,11 @@ func main() { services := []*v1.Service{service} _, err = metrics.CreateServiceMonitors(cfg, namespace, services) if err != nil { - log.Log.Info("Could not create ServiceMonitor object", "error", err.Error()) + log.Log.V(log.VWarn).Info("Could not create ServiceMonitor object", "error", err.Error()) // If this operator is deployed to a cluster without the prometheus-operator running, it will return // ErrServiceMonitorNotPresent, which can be used to safely skip ServiceMonitor creation. if err == metrics.ErrServiceMonitorNotPresent { - log.Log.Info("Install prometheus-operator in your cluster to create ServiceMonitor objects", "error", err.Error()) + log.Log.V(log.VWarn).Info("Install prometheus-operator in your cluster to create ServiceMonitor objects", "error", err.Error()) } } @@ -176,11 +176,7 @@ func serveCRMetrics(cfg *rest.Config) error { // To generate metrics in other namespaces, add the values below. ns := []string{operatorNs} // Generate and serve custom resource specific metrics. - err = kubemetrics.GenerateAndServeCRMetrics(cfg, ns, filteredGVK, metricsHost, operatorMetricsPort) - if err != nil { - return err - } - return nil + return kubemetrics.GenerateAndServeCRMetrics(cfg, ns, filteredGVK, metricsHost, operatorMetricsPort) } func fatal(err error, debug bool) { diff --git a/docs/js/main.min.15ba3b50c3bd013e1b26793d1a59390ea2e0f21481eafe4022de05a44eba88fc.js b/docs/js/main.min.15ba3b50c3bd013e1b26793d1a59390ea2e0f21481eafe4022de05a44eba88fc.js deleted file mode 100644 index 947f3f26..00000000 --- a/docs/js/main.min.15ba3b50c3bd013e1b26793d1a59390ea2e0f21481eafe4022de05a44eba88fc.js +++ /dev/null @@ -1,5 +0,0 @@ -(function($){'use strict';$(function(){$('[data-toggle="tooltip"]').tooltip();$('[data-toggle="popover"]').popover();$('.popover-dismiss').popover({trigger:'focus'})});function bottomPos(element){return element.offset().top+element.outerHeight();} -$(function(){var promo=$(".js-td-cover");if(!promo.length){return} -var promoOffset=bottomPos(promo);var navbarOffset=$('.js-navbar-scroll').offset().top;var threshold=Math.ceil($('.js-navbar-scroll').outerHeight());if((promoOffset-navbarOffset)