pkg/ansible,helm: Update metrics function

operator-framework · Jun 14, 2019 · c9be3f2 · c9be3f2
1 parent a6bfb37
commit c9be3f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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())
 	}