Fix parameters for monitoring TLSConfig

prometheus-operator/prometheus-operator#6568
changed the server name type. This commit updates how we're using that
parameter so that the project compiles with newer versions of
prometheus-operator.

Author: rhmdnd

cmd/manager/operator.go

@@ -705,6 +705,7 @@ func getDefaultRoles(platform PlatformType) []string {
 
 func generateOperatorServiceMonitor(service *v1.Service, namespace string) *monitoring.ServiceMonitor {
 	serviceMonitor := GenerateServiceMonitor(service)
+	m := "metrics." + namespace + ".svc"
 	for i := range serviceMonitor.Spec.Endpoints {
 		if serviceMonitor.Spec.Endpoints[i].Port == ctrlMetrics.ControllerMetricsServiceName {
 			serviceMonitor.Spec.Endpoints[i].Path = ctrlMetrics.HandlerPath
@@ -720,7 +721,7 @@ func generateOperatorServiceMonitor(service *v1.Service, namespace string) *moni
 			}
 			serviceMonitor.Spec.Endpoints[i].TLSConfig = &monitoring.TLSConfig{
 				SafeTLSConfig: monitoring.SafeTLSConfig{
-					ServerName: "metrics." + namespace + ".svc",
+					ServerName: &m,
 				},
 				CAFile: serviceMonitorTLSCAFile,
 			}

cmd/manager/operator_test.go

@@ -21,14 +21,15 @@ var _ = Describe("Operator Startup Function tests", func() {
 		})
 	})
 	Context("Service Monitor Creation", func() {
+		m := "metrics.foobar.svc"
 		When("Installing to non-controlled namespace", func() {
 			It("ServiceMonitor is generated with the proper TLSConfig ServerName", func() {
 				metricService := operatorMetricService("foobar")
 				sm := generateOperatorServiceMonitor(metricService, "foobar")
 				controllerMetricServiceFound := false
 				for _, ep := range sm.Spec.Endpoints {
 					if ep.Port == metrics.ControllerMetricsServiceName && ep.TLSConfig != nil {
-						Expect(ep.TLSConfig.ServerName).To(BeEquivalentTo("metrics.foobar.svc"))
+						Expect(ep.TLSConfig.ServerName).To(BeEquivalentTo(&m))
 						controllerMetricServiceFound = true
 					}
 				}