fix: detect prometheus crd support

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

controllers/logging/logging_controller.go

@@ -27,6 +27,7 @@ import (
 	"github.com/cisco-open/operator-tools/pkg/secret"
 	"github.com/cisco-open/operator-tools/pkg/utils"
 	"github.com/go-logr/logr"
+	v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/prometheus/client_golang/prometheus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -92,6 +93,20 @@ func (r *LoggingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return reconcile.Result{}, client.IgnoreNotFound(err)
 	}
 
+	if err := r.Client.List(ctx, &v1.ServiceMonitorList{}); err == nil {
+		//nolint:staticcheck
+		ctx = context.WithValue(ctx, resources.ServiceMonitorKey, true)
+	} else {
+		log.Info("WARNING ServiceMonitor is not supported in the cluster")
+	}
+
+	if err := r.Client.List(ctx, &v1.PrometheusRuleList{}); err == nil {
+		//nolint:staticcheck
+		ctx = context.WithValue(ctx, resources.PrometheusRuleKey, true)
+	} else {
+		log.Info("WARNING PormetheusRule is not supported in the cluster")
+	}
+
 	if err := logging.SetDefaults(); err != nil {
 		return reconcile.Result{}, err
 	}

pkg/resources/features.go

@@ -14,4 +14,18 @@
 
 package resources
 
+import (
+	"context"
+
+	"github.com/spf13/cast"
+)
+
 var PSPEnabled bool
+
+const ServiceMonitorKey = "ServiceMonitor"
+const PrometheusRuleKey = "PrometheusRule"
+
+func IsSupported(ctx context.Context, key string) bool {
+	value := ctx.Value(key)
+	return cast.ToBool(value)
+}

pkg/resources/fluentbit/fluentbit.go

@@ -126,15 +126,17 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 		r.configSecret,
 		r.daemonSet,
 		r.serviceMetrics,
-		r.monitorServiceMetrics,
 		r.serviceBufferMetrics,
-		r.monitorBufferServiceMetrics,
-		r.prometheusRules,
-		r.bufferVolumePrometheusRules,
 	}
 	if resources.PSPEnabled {
 		objects = append(objects, r.clusterPodSecurityPolicy, r.pspClusterRole, r.pspClusterRoleBinding)
 	}
+	if resources.IsSupported(ctx, resources.ServiceMonitorKey) {
+		objects = append(objects, r.monitorServiceMetrics, r.monitorBufferServiceMetrics)
+	}
+	if resources.IsSupported(ctx, resources.PrometheusRuleKey) {
+		objects = append(objects, r.prometheusRules, r.bufferVolumePrometheusRules)
+	}
 	for _, factory := range objects {
 		o, state, err := factory()
 		if err != nil {

pkg/resources/fluentd/fluentd.go

@@ -215,19 +215,23 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 			return result, nil
 		}
 	}
-	for _, res := range []resources.Resource{
+
+	resourceObjects := []resources.Resource{
 		r.secretConfig,
 		r.appConfigSecret,
 		r.statefulset,
 		r.service,
 		r.headlessService,
 		r.serviceMetrics,
-		r.monitorServiceMetrics,
 		r.serviceBufferMetrics,
-		r.monitorBufferServiceMetrics,
-		r.prometheusRules,
-		r.bufferVolumePrometheusRules,
-	} {
+	}
+	if resources.IsSupported(ctx, resources.ServiceMonitorKey) {
+		resourceObjects = append(objects, r.monitorServiceMetrics, r.monitorBufferServiceMetrics)
+	}
+	if resources.IsSupported(ctx, resources.PrometheusRuleKey) {
+		resourceObjects = append(objects, r.prometheusRules, r.bufferVolumePrometheusRules)
+	}
+	for _, res := range resourceObjects {
 		o, state, err := res()
 		if err != nil {
 			return nil, errors.WrapIf(err, "failed to create desired object")

pkg/resources/nodeagent/nodeagent.go

@@ -293,16 +293,16 @@ type nodeAgentInstance struct {
 }
 
 // Reconcile reconciles the InlineNodeAgent resource
-func (r *Reconciler) Reconcile(_ context.Context) (*reconcile.Result, error) {
+func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 	combinedResult := reconciler.CombinedResult{}
 	for name, userDefinedAgent := range r.agents {
-		result, err := r.processAgent(name, userDefinedAgent)
+		result, err := r.processAgent(ctx, name, userDefinedAgent)
 		combinedResult.Combine(result, err)
 	}
 	return &combinedResult.Result, combinedResult.Err
 }
 
-func (r *Reconciler) processAgent(name string, userDefinedAgent v1beta1.NodeAgentConfig) (*reconcile.Result, error) {
+func (r *Reconciler) processAgent(ctx context.Context, name string, userDefinedAgent v1beta1.NodeAgentConfig) (*reconcile.Result, error) {
 	var instance nodeAgentInstance
 	NodeAgentFluentbitDefaults, err := NodeAgentFluentbitDefaults(userDefinedAgent)
 	if err != nil {
@@ -339,23 +339,25 @@ func (r *Reconciler) processAgent(name string, userDefinedAgent v1beta1.NodeAgen
 		loggingDataProvider: r.fluentdDataProvider,
 	}
 
-	return instance.Reconcile()
+	return instance.Reconcile(ctx)
 }
 
 // Reconcile reconciles the nodeAgentInstance resource
-func (n *nodeAgentInstance) Reconcile() (*reconcile.Result, error) {
+func (n *nodeAgentInstance) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 	objects := []resources.Resource{
 		n.serviceAccount,
 		n.clusterRole,
 		n.clusterRoleBinding,
 		n.configSecret,
 		n.daemonSet,
 		n.serviceMetrics,
-		n.monitorServiceMetrics,
 	}
 	if resources.PSPEnabled {
 		objects = append(objects, n.clusterPodSecurityPolicy, n.pspClusterRole, n.pspClusterRoleBinding)
 	}
+	if resources.IsSupported(ctx, resources.ServiceMonitorKey) {
+		objects = append(objects, n.monitorServiceMetrics)
+	}
 	for _, factory := range objects {
 		o, state, err := factory()
 		if err != nil {

pkg/resources/syslogng/syslogng.go

@@ -214,18 +214,21 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 			return result, nil
 		}
 	}
-	for _, res := range []resources.Resource{
+	resourceObjects := []resources.Resource{
 		r.configSecret,
 		r.statefulset,
 		r.service,
 		r.headlessService,
 		r.serviceMetrics,
-		r.monitorServiceMetrics,
 		r.serviceBufferMetrics,
-		r.monitorBufferServiceMetrics,
-		r.prometheusRules,
-		r.bufferVolumePrometheusRules,
-	} {
+	}
+	if resources.IsSupported(ctx, resources.ServiceMonitorKey) {
+		resourceObjects = append(resourceObjects, r.monitorServiceMetrics, r.monitorBufferServiceMetrics)
+	}
+	if resources.IsSupported(ctx, resources.PrometheusRuleKey) {
+		resourceObjects = append(resourceObjects, r.prometheusRules, r.bufferVolumePrometheusRules)
+	}
+	for _, res := range resourceObjects {
 		o, state, err := res()
 		if err != nil {
 			return nil, errors.WrapIf(err, "failed to create desired object")