Merge branch 'master' into test/hypershift

Author: iam-veeramalla

README.md

@@ -122,7 +122,7 @@ The Index image powers the listing of the Operator on OperatorHub.
 
 ## Migrate from [Argo CD Community Operator](https://github.com/argoproj-labs/argocd-operator) to GitOps Operator
 
-Please follow the steps mentioned in the doc to migrate from [Argo CD Community Operator](https://github.com/argoproj-labs/argocd-operator) to GitOps Operator.
+Please follow the [migration guide](https://github.com/redhat-developer/gitops-operator/blob/master/docs/Migration_Guide.md) when moving from the [Argo CD Community Operator](https://github.com/argoproj-labs/argocd-operator) to the GitOps Operator.
 
 ## Progressive Delivery
 

controllers/argocd_controller.go

@@ -45,11 +45,12 @@ import (
 )
 
 const (
-	argocdNS           = "openshift-gitops"
-	depracatedArgoCDNS = "openshift-pipelines-app-delivery"
-	consoleLinkName    = "argocd"
-	argocdRouteName    = "openshift-gitops-server"
-	iconFilePath       = "/argo.png"
+	argocdNS                 = "openshift-gitops"
+	depracatedArgoCDNS       = "openshift-pipelines-app-delivery"
+	consoleLinkName          = "argocd"
+	argocdRouteName          = "openshift-gitops-server"
+	iconFilePath             = "/argo.png"
+	operatorPodNamespacePath = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
 )
 
 var (

controllers/argocd_metrics_controller.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"embed"
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -41,11 +42,13 @@ import (
 )
 
 const (
-	readRoleNameFormat        = "%s-read"
-	readRoleBindingNameFormat = "%s-prometheus-k8s-read-binding"
-	alertRuleName             = "gitops-operator-argocd-alerts"
-	dashboardNamespace        = "openshift-config-managed"
-	dashboardFolder           = "dashboards"
+	readRoleNameFormat         = "%s-read"
+	readRoleBindingNameFormat  = "%s-prometheus-k8s-read-binding"
+	alertRuleName              = "gitops-operator-argocd-alerts"
+	dashboardNamespace         = "openshift-config-managed"
+	dashboardFolder            = "dashboards"
+	operatorMetricsServiceName = "openshift-gitops-operator-metrics-service"
+	operatorMetricsMonitorName = "openshift-gitops-operator-metrics-monitor"
 )
 
 type ArgoCDMetricsReconciler struct {
@@ -170,6 +173,11 @@ func (r *ArgoCDMetricsReconciler) Reconcile(ctx context.Context, request reconci
 		return reconcile.Result{}, err
 	}
 
+	err = r.reconcileOperatorMetricsServiceMonitor(reqLogger)
+	if err != nil {
+		return reconcile.Result{}, err
+	}
+
 	return reconcile.Result{}, nil
 }
 
@@ -274,6 +282,38 @@ func (r *ArgoCDMetricsReconciler) createServiceMonitorIfAbsent(namespace string,
 	return err
 }
 
+func (r *ArgoCDMetricsReconciler) reconcileOperatorMetricsServiceMonitor(reqLogger logr.Logger) error {
+
+	data, err := os.ReadFile(operatorPodNamespacePath)
+	if err != nil {
+		reqLogger.Error(err, "Error retrieving operator's running namespace")
+		return err
+	}
+
+	operatorNS := string(data)
+	desiredMetricsServerName := operatorMetricsServiceName + "." + operatorNS + ".svc"
+
+	existingServiceMonitor := &monitoringv1.ServiceMonitor{}
+	err = r.Client.Get(context.TODO(), types.NamespacedName{Name: operatorMetricsMonitorName, Namespace: operatorNS}, existingServiceMonitor)
+
+	if err != nil {
+		if !errors.IsNotFound(err) {
+			reqLogger.Error(err, "Error querying for ServiceMonitor", "Namespace", operatorNS, "Name", operatorMetricsMonitorName)
+			return err
+		}
+
+		// no svc monitor found, nothing to do
+		return nil
+	}
+
+	if existingServiceMonitor.Spec.Endpoints[0].TLSConfig.ServerName != desiredMetricsServerName {
+		existingServiceMonitor.Spec.Endpoints[0].TLSConfig.ServerName = desiredMetricsServerName
+		return r.Client.Update(context.TODO(), existingServiceMonitor)
+	}
+
+	return nil
+}
+
 func (r *ArgoCDMetricsReconciler) createPrometheusRuleIfAbsent(namespace string, argocd *argoapp.ArgoCD, reqLogger logr.Logger) error {
 	alertRule := newPrometheusRule(namespace)
 	existingAlertRule := &monitoringv1.PrometheusRule{}

test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/01-errors.yaml

@@ -8,6 +8,10 @@ commands:
     csv_name=$(oc get csv -n openshift-gitops-operator | awk '/gitops-operator/ {print $1}')
     ocp_version=$(oc version | awk '/Server Version/ {split($3,a,"-"); print a[1]}')
 
+    if [[ ${ocp_version} =~ "4.15" ]]; then
+      exit 0
+    fi
+
     # Patch the CSV to add the necessary env key:value for Dynamic Plugin
     oc patch csv "${csv_name}" -n openshift-gitops-operator \
     --type='json' \