change metricsHub var

Signed-off-by: Thibault Mange <[email protected]>
stolostron · Dec 2, 2024 · f84c657 · f84c657
1 parent 57e2104
commit f84c657
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/...servability/controllers/multiclusterobservability/multiclusterobservability_controller.go b/...servability/controllers/multiclusterobservability/multiclusterobservability_controller.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	cerr "errors"
 	"fmt"
+	"net/url"
 	"os"
 	"reflect"
 	"strings"
@@ -52,6 +53,7 @@ import (
 	placementctrl "github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/controllers/placementrule"
 	certctrl "github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/pkg/certificates"
 	"github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/pkg/config"
+	mcoconfig "github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/pkg/config"
 	"github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/pkg/rendering"
 	smctrl "github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/pkg/servicemonitor"
 	"github.com/stolostron/multicluster-observability-operator/operators/multiclusterobservability/pkg/util"
@@ -266,10 +268,19 @@ func (r *MultiClusterObservabilityReconciler) Reconcile(ctx context.Context, req
 	}
 	disableMCOACMAORender := !apierrors.IsNotFound(err)
 
+	obsAPIURL := &url.URL{}
+	if !disableMCOACMAORender {
+		obsAPIURL, err = mcoconfig.GetObsAPIExternalURL(ctx, r.Client, mcoconfig.GetDefaultNamespace())
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to get the Observatorium API URL: %w", err)
+		}
+	}
+
 	// Build render options
 	rendererOptions := &rendering.RendererOptions{
 		MCOAOptions: rendering.MCOARendererOptions{
-			DisableCMAORender: disableMCOACMAORender,
+			DisableCMAORender:  disableMCOACMAORender,
+			MetricsHubHostname: obsAPIURL.Host,
 		},
 	}
 

diff --git a/operators/multiclusterobservability/pkg/rendering/renderer_mcoa.go b/operators/multiclusterobservability/pkg/rendering/renderer_mcoa.go
@@ -5,7 +5,6 @@
 package rendering
 
 import (
-	"context"
 	"fmt"
 
 	prometheusv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -34,11 +33,12 @@ const (
 	nameUserWorkloadTracesCollection  = "userWorkloadTracesCollection"
 	nameUserWorkloadInstrumentation   = "userWorkloadInstrumentation"
 	nameUserWorkloadMetricsCollection = "userWorkloadMetricsCollection"
-	nameSignalsHubEndpoint            = "signalsHubEndpoint"
+	nameMetricsHubHostname            = "metricsHubHostname"
 )
 
 type MCOARendererOptions struct {
-	DisableCMAORender bool
+	DisableCMAORender  bool
+	MetricsHubHostname string
 }
 
 func (r *MCORenderer) newMCOARenderer() {
@@ -341,12 +341,11 @@ func (r *MCORenderer) renderAddonDeploymentConfig(
 			}
 		}
 
-		if (cs.Platform != nil && cs.Platform.Metrics.Collection.Enabled) || (cs.UserWorkloads != nil && cs.UserWorkloads.Metrics.Collection.Enabled) {
-			obsAPIURL, err := mcoconfig.GetObsAPIExternalURL(context.TODO(), r.kubeClient, namespace)
-			if err != nil {
-				return nil, fmt.Errorf("failed to get the Observatorium API URL: %w", err)
+		if r.rendererOptions != nil {
+			metricsHubHostname := r.rendererOptions.MCOAOptions.MetricsHubHostname
+			if metricsHubHostname != "" {
+				appendCustomVar(aodc, nameMetricsHubHostname, metricsHubHostname)
 			}
-			appendCustomVar(aodc, nameSignalsHubEndpoint, obsAPIURL.Host)
 		}
 
 		u.Object, err = runtime.DefaultUnstructuredConverter.ToUnstructured(aodc)

diff --git a/operators/multiclusterobservability/pkg/rendering/renderer_mcoa_test.go b/operators/multiclusterobservability/pkg/rendering/renderer_mcoa_test.go
@@ -167,9 +167,6 @@ func TestRenderAddonDeploymentConfig(t *testing.T) {
 					},
 				},
 			},
-			AdvancedConfig: &mcov1beta2.AdvancedConfig{
-				CustomObservabilityHubURL: "https://observability-hub",
-			},
 		},
 	}
 
@@ -181,7 +178,11 @@ func TestRenderAddonDeploymentConfig(t *testing.T) {
 		WithObjects(mco).
 		Build()
 
-	renderer := &MCORenderer{cr: mco, kubeClient: fakeClient}
+	renderer := &MCORenderer{cr: mco, kubeClient: fakeClient, rendererOptions: &RendererOptions{
+		MCOAOptions: MCOARendererOptions{
+			MetricsHubHostname: "observability-hub",
+		},
+	}}
 
 	uobj, err := renderer.renderAddonDeploymentConfig(aodc, "test", map[string]string{"key": "value"})
 	assert.NoError(t, err)
@@ -203,7 +204,7 @@ func TestRenderAddonDeploymentConfig(t *testing.T) {
 	assert.Contains(t, got.Spec.CustomizedVariables, addonv1alpha1.CustomizedVariable{Name: nameUserWorkloadInstrumentation, Value: instrV1alpha1})
 	assert.Contains(t, got.Spec.CustomizedVariables, addonv1alpha1.CustomizedVariable{Name: namePlatformMetricsCollection, Value: promV1alpha1})
 	assert.Contains(t, got.Spec.CustomizedVariables, addonv1alpha1.CustomizedVariable{Name: nameUserWorkloadMetricsCollection, Value: promV1alpha1})
-	assert.Contains(t, got.Spec.CustomizedVariables, addonv1alpha1.CustomizedVariable{Name: nameSignalsHubEndpoint, Value: "observability-hub"})
+	assert.Contains(t, got.Spec.CustomizedVariables, addonv1alpha1.CustomizedVariable{Name: nameMetricsHubHostname, Value: "observability-hub"})
 }
 
 func TestMCORenderer_RenderClusterManagementAddOn(t *testing.T) {