fix prom api breaking changes

Author: jotak

internal/controller/consoleplugin/consoleplugin_objects.go

@@ -125,7 +125,7 @@ func (b *builder) serviceMonitor() *monitoringv1.ServiceMonitor {
 				{
 					Port:     metricsPortName,
 					Interval: "15s",
-					Scheme:   "https",
+					Scheme:   ptr.To(monitoringv1.SchemeHTTPS),
 					TLSConfig: &monitoringv1.TLSConfig{
 						SafeTLSConfig: monitoringv1.SafeTLSConfig{
 							ServerName: ptr.To(serverName),

internal/controller/ebpf/agent_metrics.go

@@ -104,7 +104,7 @@ func (c *AgentController) promServiceMonitoring(target *flowslatest.FlowCollecto
 				{
 					Port:      "metrics",
 					Interval:  "30s",
-					Scheme:    scheme,
+					Scheme:    &scheme,
 					TLSConfig: smTLS,
 				},
 			},

internal/controller/flp/flp_common_objects.go

@@ -359,7 +359,7 @@ func serviceMonitor(desired *flowslatest.FlowCollectorSpec, smName, svcName, nam
 				{
 					Port:        prometheusPortName,
 					Interval:    "15s",
-					Scheme:      scheme,
+					Scheme:      &scheme,
 					TLSConfig:   smTLS,
 					HonorLabels: true,
 					// Relabel for Thanos multi-tenant endpoint, which requires having the namespace label

internal/controller/flp/flp_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/netobserv/network-observability-operator/internal/pkg/helper"
 	"github.com/netobserv/network-observability-operator/internal/pkg/manager/status"
 	"github.com/netobserv/network-observability-operator/internal/pkg/metrics/alerts"
+	v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
@@ -555,7 +556,7 @@ func TestServiceMonitorChanged(t *testing.T) {
 	// Check scheme changed
 	b, _ = newMonolithBuilder(info.NewInstance(image2, status.Instance{}), &cfg, b.flowMetrics, nil, nil)
 	fourth := b.serviceMonitor()
-	fourth.Spec.Endpoints[0].Scheme = "https"
+	fourth.Spec.Endpoints[0].Scheme = ptr.To(v1.SchemeHTTPS)
 
 	report = helper.NewChangeReport("")
 	assert.True(helper.ServiceMonitorChanged(third, fourth, &report))

internal/pkg/helper/monitoring.go

@@ -28,18 +28,18 @@ func GetSecretOrConfigMap(file *flowslatest.FileReference) monitoringv1.SecretOr
 	}
 }
 
-func GetServiceMonitorTLSConfig(tls *flowslatest.ServerTLS, serverName string, isDownstream bool) (string, *monitoringv1.TLSConfig) {
+func GetServiceMonitorTLSConfig(tls *flowslatest.ServerTLS, serverName string, isDownstream bool) (monitoringv1.Scheme, *monitoringv1.TLSConfig) {
 	if tls.Type == flowslatest.ServerTLSAuto {
 		if isDownstream {
-			return "https", &monitoringv1.TLSConfig{
+			return monitoringv1.SchemeHTTPS, &monitoringv1.TLSConfig{
 				SafeTLSConfig: monitoringv1.SafeTLSConfig{
 					ServerName: ptr.To(serverName),
 				},
 				CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
 			}
 		}
 		// Upstream prometheus disallows CAFile
-		return "https", &monitoringv1.TLSConfig{
+		return monitoringv1.SchemeHTTPS, &monitoringv1.TLSConfig{
 			SafeTLSConfig: monitoringv1.SafeTLSConfig{
 				ServerName: ptr.To(serverName),
 				CA: monitoringv1.SecretOrConfigMap{
@@ -64,8 +64,8 @@ func GetServiceMonitorTLSConfig(tls *flowslatest.ServerTLS, serverName string, i
 		if !tls.InsecureSkipVerify && tls.ProvidedCaFile != nil && tls.ProvidedCaFile.File != "" {
 			tlsOut.SafeTLSConfig.CA = GetSecretOrConfigMap(tls.ProvidedCaFile)
 		}
-		return "https", &tlsOut
+		return monitoringv1.SchemeHTTPS, &tlsOut
 	}
 
-	return "http", nil
+	return monitoringv1.SchemeHTTP, nil
 }