Added controller and Role stuff

Signed-off-by: Yuri Sa <yurimsa@gmail.com>
open-telemetry · Jul 4, 2024 · 0649525 · 0649525
1 parent 2f0f7a2
commit 0649525
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,7 +99,7 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2024-06-25T12:03:57Z"
+    createdAt: "2024-07-04T10:25:00Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -353,6 +353,8 @@ spec:
           - monitoring.coreos.com
           resources:
           - podmonitors
+          - probes
+          - scrapeconfigs
           - servicemonitors
           verbs:
           - create

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -99,6 +99,8 @@ rules:
   - monitoring.coreos.com
   resources:
   - podmonitors
+  - probes
+  - scrapeconfigs
   - servicemonitors
   verbs:
   - create

diff --git a/controllers/opentelemetrycollector_controller.go b/controllers/opentelemetrycollector_controller.go
@@ -23,6 +23,7 @@ import (
 	"github.com/go-logr/logr"
 	routev1 "github.com/openshift/api/route/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	promv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
@@ -90,6 +91,8 @@ func (r *OpenTelemetryCollectorReconciler) findOtelOwnedObjects(ctx context.Cont
 		ownedObjectTypes = append(ownedObjectTypes,
 			&monitoringv1.ServiceMonitor{},
 			&monitoringv1.PodMonitor{},
+			&monitoringv1.Probe{},
+			&promv1alpha1.ScrapeConfig{},
 		)
 	}
 	if params.Config.OpenShiftRoutesAvailability() == openshift.RoutesAvailable {
@@ -205,7 +208,7 @@ func NewReconciler(p Params) *OpenTelemetryCollectorReconciler {
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;create;update
-// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;podmonitors,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;podmonitors;scrapeconfigs;probes,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=route.openshift.io,resources=routes;routes/custom-host,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=config.openshift.io,resources=infrastructures;infrastructures/status,verbs=get;list;watch
@@ -311,6 +314,8 @@ func (r *OpenTelemetryCollectorReconciler) SetupWithManager(mgr ctrl.Manager) er
 	if featuregate.PrometheusOperatorIsAvailable.IsEnabled() && r.config.PrometheusCRAvailability() == prometheus.Available {
 		builder.Owns(&monitoringv1.ServiceMonitor{})
 		builder.Owns(&monitoringv1.PodMonitor{})
+		builder.Owns(&monitoringv1.Probe{})
+		builder.Owns(&promv1alpha1.ScrapeConfig{})
 	}
 	if r.config.OpenShiftRoutesAvailability() == openshift.RoutesAvailable {
 		builder.Owns(&routev1.Route{})