Merge pull request #1690 from simonpasquier/mon-2289

Bug 2100860: Pass user-defined Alertmanager service in shared configmap

Author: openshift-merge-robot

pkg/manifests/manifests.go

@@ -1516,7 +1516,10 @@ func (f *Factory) ThanosQuerierRoute() (*routev1.Route, error) {
 	return r, nil
 }
 
-func (f *Factory) SharingConfig(promHost, amHost, thanosHost *url.URL) *v1.ConfigMap {
+func (f *Factory) SharingConfig(
+	promHost, amHost, thanosHost *url.URL,
+	alertmanagerUserWorkloadHost, alertmanagerTenancyHost string,
+) *v1.ConfigMap {
 	data := map[string]string{}
 
 	// Configmap keys need to include "public" to indicate that they are public values.
@@ -1532,6 +1535,8 @@ func (f *Factory) SharingConfig(promHost, amHost, thanosHost *url.URL) *v1.Confi
 	if thanosHost != nil {
 		data["thanosPublicURL"] = fmt.Sprintf("%s://%s", thanosHost.Scheme, thanosHost.Host)
 	}
+	data["alertmanagerUserWorkloadHost"] = alertmanagerUserWorkloadHost
+	data["alertmanagerTenancyHost"] = alertmanagerTenancyHost
 
 	return &v1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{

pkg/manifests/manifests_test.go

@@ -685,13 +685,13 @@ func TestSharingConfig(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			cm := f.SharingConfig(u, u, u)
+			cm := f.SharingConfig(u, u, u, "alertmanager-main.openshift-monitoring.svc:9094", "alertmanager-main.openshift-monitoring.svc:9092")
 			if cm.Namespace == "openshift-monitoring" {
 				t.Fatalf("expecting namespace other than %q", "openshift-monitoring")
 			}
 			for k, v := range cm.Data {
 				if !strings.Contains(k, "Public") {
-					t.Fatalf("expecting key %q to contain 'Public'", k)
+					continue
 				}
 				publicURL, err := url.Parse(v)
 				if err != nil {

pkg/tasks/configsharing.go

@@ -16,11 +16,14 @@ package tasks
 
 import (
 	"context"
+	"fmt"
 	"net/url"
 
+	"github.com/pkg/errors"
+	v1 "k8s.io/api/core/v1"
+
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
-	"github.com/pkg/errors"
 )
 
 type ConfigSharingTask struct {
@@ -71,7 +74,49 @@ func (t *ConfigSharingTask) Run(ctx context.Context) error {
 		return errors.Wrap(err, "failed to retrieve Thanos Querier host")
 	}
 
-	cm := t.factory.SharingConfig(promURL, amURL, thanosURL)
+	var (
+		svc                  *v1.Service
+		webPort, tenancyPort int
+	)
+	if t.config.UserWorkloadConfiguration.Alertmanager.Enabled {
+		// User-defined alerts are routed to the UWM Alertmanager.
+		svc, err = t.factory.AlertmanagerUserWorkloadService()
+		if err != nil {
+			return errors.Wrap(err, "initializing Alertmanager User Workload Service failed")
+		}
+	} else {
+		// User-defined alerts are routed to the platform Alertmanager.
+		svc, err = t.factory.AlertmanagerService()
+		if err != nil {
+			return errors.Wrap(err, "initializing Alertmanager Service failed")
+		}
+	}
+
+	for _, port := range svc.Spec.Ports {
+		switch port.Name {
+		case "web":
+			webPort = int(port.Port)
+		case "tenancy":
+			tenancyPort = int(port.Port)
+		}
+	}
+
+	if webPort == 0 {
+		return errors.New("failed to find Alertmanager web port")
+	}
+
+	if tenancyPort == 0 {
+		return errors.New("failed to find Alertmanager tenancy port")
+	}
+
+	cm := t.factory.SharingConfig(
+		promURL,
+		amURL,
+		thanosURL,
+		fmt.Sprintf("%s.%s.svc:%d", svc.Name, svc.Namespace, webPort),
+		fmt.Sprintf("%s.%s.svc:%d", svc.Name, svc.Namespace, tenancyPort),
+	)
+
 	err = t.client.CreateOrUpdateConfigMap(ctx, cm)
 	if err != nil {
 		return errors.Wrapf(err, "reconciling %s/%s Config ConfigMap failed", cm.Namespace, cm.Name)