pkg/cvo/metrics: Add more fields to MetricsOptions

Author: DavidHurta

pkg/cvo/metrics.go

@@ -202,6 +202,11 @@ func handleServerResult(result asyncResult, lastLoopError error) error {
 }
 
 type MetricsOptions struct {
+	ListenAddress string
+
+	ServingCertFile string
+	ServingKeyFile  string
+
 	DisableAuthentication bool
 	DisableAuthorization  bool
 }
@@ -213,12 +218,12 @@ type MetricsOptions struct {
 // Continues serving until runContext.Done() and then attempts a clean
 // shutdown limited by shutdownContext.Done(). Assumes runContext.Done()
 // occurs before or simultaneously with shutdownContext.Done().
-func RunMetrics(runContext context.Context, shutdownContext context.Context, listenAddress, certFile, keyFile string, restConfig *rest.Config, metricsOptions MetricsOptions) error {
-	if listenAddress == "" {
+func RunMetrics(runContext context.Context, shutdownContext context.Context, restConfig *rest.Config, options MetricsOptions) error {
+	if options.ListenAddress == "" {
 		return errors.New("listen address is required to serve metrics")
 	}
 
-	if metricsOptions.DisableAuthentication && !metricsOptions.DisableAuthorization {
+	if options.DisableAuthentication && !options.DisableAuthorization {
 		return errors.New("invalid configuration: cannot enable authorization without authentication")
 	}
 
@@ -230,7 +235,11 @@ func RunMetrics(runContext context.Context, shutdownContext context.Context, lis
 	resultChannelCount := 0
 
 	// Create a dynamic serving cert/key controller to watch for serving certificate changes from files.
-	servingContentController, err := dynamiccertificates.NewDynamicServingContentFromFiles("metrics-serving-cert", certFile, keyFile)
+	servingContentController, err := dynamiccertificates.NewDynamicServingContentFromFiles(
+		"metrics-serving-cert",
+		options.ServingCertFile,
+		options.ServingKeyFile,
+	)
 	if err != nil {
 		return fmt.Errorf("failed to create serving certificate controller: %w", err)
 	}
@@ -248,7 +257,7 @@ func RunMetrics(runContext context.Context, shutdownContext context.Context, lis
 	clientAuth := tls.NoClientCert
 	var clientCA dynamiccertificates.CAContentProvider
 	var clientCAController *dynamiccertificates.ConfigMapCAController
-	if !metricsOptions.DisableAuthentication {
+	if !options.DisableAuthentication {
 		// Create a dynamic CA controller to watch for client CA changes from a ConfigMap.
 		kubeClient, err := kubernetes.NewForConfig(restConfig)
 		if err != nil {
@@ -318,7 +327,7 @@ func RunMetrics(runContext context.Context, shutdownContext context.Context, lis
 		resultChannel <- asyncResult{name: "serving certification controller"}
 	}()
 
-	server := createHttpServer(metricsOptions.DisableAuthorization)
+	server := createHttpServer(options.DisableAuthorization)
 	tlsConfig := crypto.SecureTLSConfig(&tls.Config{
 		GetConfigForClient: func(clientHello *tls.ClientHelloInfo) (*tls.Config, error) {
 			config, err := servingCertController.GetConfigForClient(clientHello)
@@ -336,7 +345,7 @@ func RunMetrics(runContext context.Context, shutdownContext context.Context, lis
 
 	resultChannelCount++
 	go func() {
-		startListening(server, tlsConfig, listenAddress, resultChannel)
+		startListening(server, tlsConfig, options.ListenAddress, resultChannel)
 	}()
 
 	// Wait for server to exit or shutdown signal

pkg/start/start.go

@@ -351,10 +351,13 @@ func (o *Options) run(ctx context.Context, controllerCtx *Context, lock resource
 						go func() {
 							defer utilruntime.HandleCrash()
 							options := cvo.MetricsOptions{
+								ListenAddress:         o.ListenAddr,
+								ServingCertFile:       o.ServingCertFile,
+								ServingKeyFile:        o.ServingKeyFile,
 								DisableAuthentication: o.HyperShift,
 								DisableAuthorization:  o.HyperShift,
 							}
-							err := cvo.RunMetrics(postMainContext, shutdownContext, o.ListenAddr, o.ServingCertFile, o.ServingKeyFile, restConfig, options)
+							err := cvo.RunMetrics(postMainContext, shutdownContext, restConfig, options)
 							resultChannel <- asyncResult{name: "metrics server", error: err}
 						}()
 					}