public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Reorganize imports in main.go, add warning level to metrics logs

This commit is contained in:
Jakub Al-Khalili 2019-09-09 15:32:18 +02:00
parent d7f2d630ef
commit 5633ed434a
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/manager/main.go
View File

@ -4,10 +4,6 @@ import (
"context" "context"
"flag" "flag"
"fmt" "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" "os"
"runtime" "runtime"
@ -31,6 +27,10 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" _ "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/client/config"
"sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals" "sigs.k8s.io/controller-runtime/pkg/runtime/signals"
@ -124,7 +124,7 @@ func main() {
} }
if err = serveCRMetrics(cfg); err != nil { 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. // 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). // Create Service object to expose the metrics port(s).
service, err := metrics.CreateMetricsService(ctx, cfg, servicePorts) service, err := metrics.CreateMetricsService(ctx, cfg, servicePorts)
if err != nil { 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 // CreateServiceMonitors will automatically create the prometheus-operator ServiceMonitor resources
@ -143,11 +143,11 @@ func main() {
services := []*v1.Service{service} services := []*v1.Service{service}
_, err = metrics.CreateServiceMonitors(cfg, namespace, services) _, err = metrics.CreateServiceMonitors(cfg, namespace, services)
if err != nil { 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 // 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. // ErrServiceMonitorNotPresent, which can be used to safely skip ServiceMonitor creation.
if err == metrics.ErrServiceMonitorNotPresent { 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. // To generate metrics in other namespaces, add the values below.
ns := []string{operatorNs} ns := []string{operatorNs}
// Generate and serve custom resource specific metrics. // Generate and serve custom resource specific metrics.
err = kubemetrics.GenerateAndServeCRMetrics(cfg, ns, filteredGVK, metricsHost, operatorMetricsPort) return kubemetrics.GenerateAndServeCRMetrics(cfg, ns, filteredGVK, metricsHost, operatorMetricsPort)
if err != nil {
return err
}
return nil
} }
func fatal(err error, debug bool) { func fatal(err error, debug bool) {

5
docs/js/main.min.15ba3b50c3bd013e1b26793d1a59390ea2e0f21481eafe4022de05a44eba88fc.js
View File

@ -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)<threshold){$('.js-navbar-scroll').addClass('navbar-bg-onscroll');}
$(window).on('scroll',function(){var navtop=$('.js-navbar-scroll').offset().top-$(window).scrollTop();var promoOffset=bottomPos($('.js-td-cover'));var navbarOffset=$('.js-navbar-scroll').offset().top;if((promoOffset-navbarOffset)<threshold){$('.js-navbar-scroll').addClass('navbar-bg-onscroll');}else{$('.js-navbar-scroll').removeClass('navbar-bg-onscroll');$('.js-navbar-scroll').addClass('navbar-bg-onscroll--fade');}});});}(jQuery));(function($){'use strict';var Search={init:function(){$(document).ready(function(){$(document).on('keypress','.td-search-input',function(e){if(e.keyCode!==13){return}
var query=$(this).val();var searchPage="https://jenkinsci.github.io/kubernetes-operator/search/?q="+query;document.location=searchPage;return false;});});},};Search.init();}(jQuery));

5
docs/js/main.min.e5ae77169eed324fae314e8a3a62a1b7c40ef1a656c462c09a03c20d5cfbb057.js
View File

@ -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)<threshold){$('.js-navbar-scroll').addClass('navbar-bg-onscroll');}
$(window).on('scroll',function(){var navtop=$('.js-navbar-scroll').offset().top-$(window).scrollTop();var promoOffset=bottomPos($('.js-td-cover'));var navbarOffset=$('.js-navbar-scroll').offset().top;if((promoOffset-navbarOffset)<threshold){$('.js-navbar-scroll').addClass('navbar-bg-onscroll');}else{$('.js-navbar-scroll').removeClass('navbar-bg-onscroll');$('.js-navbar-scroll').addClass('navbar-bg-onscroll--fade');}});});}(jQuery));(function($){'use strict';var Search={init:function(){$(document).ready(function(){$(document).on('keypress','.td-search-input',function(e){if(e.keyCode!==13){return}
var query=$(this).val();var searchPage="/kubernetes-operator/search/?q="+query;document.location=searchPage;return false;});});},};Search.init();}(jQuery));