From c9be3f23b4166e2d0cd2910c5eabdcd012e7754c Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 13 Jun 2019 18:42:54 +0200 Subject: [PATCH] pkg/ansible,helm: Update metrics function --- pkg/ansible/run.go | 5 ++++- pkg/helm/run.go | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/ansible/run.go b/pkg/ansible/run.go index c60b07642a8..3fc74b0a78d 100644 --- a/pkg/ansible/run.go +++ b/pkg/ansible/run.go @@ -85,8 +85,11 @@ func Run(flags *aoflags.AnsibleOperatorFlags) error { return err } + metricsService := []metrics.MetricService{ + {Port: 8383, PortName: metrics.OperatorPortName}, + } // TODO: probably should expose the port as an environment variable - _, err = metrics.ExposeMetricsPort(context.TODO(), 8383) + _, err = metrics.CreateMetricsService(context.TODO(), metricsService) if err != nil { log.Error(err, "Exposing metrics port failed.") return err diff --git a/pkg/helm/run.go b/pkg/helm/run.go index 866ea619a24..495608faac8 100644 --- a/pkg/helm/run.go +++ b/pkg/helm/run.go @@ -117,8 +117,12 @@ func Run(flags *hoflags.HelmOperatorFlags) error { return err } - // Create Service object to expose the metrics port. - _, err = metrics.ExposeMetricsPort(ctx, metricsPort) + // Add to the below struct any other metrics ports you want to expose. + metricsService := []metrics.MetricService{ + {Port: metricsPort, PortName: metrics.OperatorPortName}, + } + // Create Service object to expose the metrics port(s). + _, err = metrics.CreateMetricsService(ctx, metricsService) if err != nil { log.Info(err.Error()) }