Skip to content

Commit

Permalink
Fix too often reconciliations
Browse files Browse the repository at this point in the history
  • Loading branch information
@skhalash
skhalash committed Jan 19, 2024
1 parent 15d25e9 commit e95aecb
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 20 deletions.
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: europe-docker.pkg.dev/kyma-project/prod/telemetry-manager
newTag: main
newName: skhalashatsap/telemetry-operator
newTag: latest
5 changes: 4 additions & 1 deletion controllers/telemetry/logparser_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (

Check failure on line 26 in controllers/telemetry/logparser_controller.go

View workflow job for this annotation

GitHub Actions / lint 

File is not `goimports`-ed with -local github.com/kyma-project/telemetry-manager (goimports)
telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1"
"github.com/kyma-project/telemetry-manager/internal/reconciler/logparser"
"sigs.k8s.io/controller-runtime/pkg/predicate"

Check failure on line 29 in controllers/telemetry/logparser_controller.go

View workflow job for this annotation

GitHub Actions / lint 

File is not `gci`-ed with --skip-generated -s standard -s default -s prefix(github.com/kyma-project/telemetry-manager) -s blank --custom-order (gci)
"sigs.k8s.io/controller-runtime/pkg/builder"

Check failure on line 30 in controllers/telemetry/logparser_controller.go

View workflow job for this annotation

GitHub Actions / lint 

File is not `gofmt`-ed with `-s` (gofmt)
)

// LogParserReconciler reconciles a Logparser object
Expand Down Expand Up @@ -53,6 +55,7 @@ func (r *LogParserReconciler) SetupWithManager(mgr ctrl.Manager) error {
For(&telemetryv1alpha1.LogParser{}).
Watches(
&corev1.ConfigMap{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogParser{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogParser{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Complete(r)
}
23 changes: 16 additions & 7 deletions controllers/telemetry/logpipeline_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import (

telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1"

Check failure on line 29 in controllers/telemetry/logpipeline_controller.go

View workflow job for this annotation

GitHub Actions / lint 

File is not `goimports`-ed with -local github.com/kyma-project/telemetry-manager (goimports)
"github.com/kyma-project/telemetry-manager/internal/reconciler/logpipeline"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/predicate"
)

// LogPipelineReconciler reconciles a LogPipeline object
Expand Down Expand Up @@ -56,24 +58,31 @@ func (r *LogPipelineReconciler) SetupWithManager(mgr ctrl.Manager) error {
For(&telemetryv1alpha1.LogPipeline{}).
Watches(
&appsv1.DaemonSet{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.Service{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.ConfigMap{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.ServiceAccount{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&rbacv1.ClusterRole{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&rbacv1.ClusterRoleBinding{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.Secret{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.LogPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Complete(r)
}
16 changes: 11 additions & 5 deletions controllers/telemetry/metricpipeline_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1"
"github.com/kyma-project/telemetry-manager/internal/reconciler/metricpipeline"
"github.com/kyma-project/telemetry-manager/internal/setup"
"sigs.k8s.io/controller-runtime/pkg/predicate"
)

// MetricPipelineReconciler reconciles a MetricPipeline object
Expand Down Expand Up @@ -63,19 +64,24 @@ func (r *MetricPipelineReconciler) SetupWithManager(mgr ctrl.Manager) error {
For(&telemetryv1alpha1.MetricPipeline{}).
Watches(
&corev1.ConfigMap{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&appsv1.Deployment{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.Secret{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.Service{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&networkingv1.NetworkPolicy{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.MetricPipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&apiextensionsv1.CustomResourceDefinition{},
handler.EnqueueRequestsFromMapFunc(r.mapCRDChanges),
Expand Down
16 changes: 11 additions & 5 deletions controllers/telemetry/tracepipeline_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1"
"github.com/kyma-project/telemetry-manager/internal/reconciler/tracepipeline"
"github.com/kyma-project/telemetry-manager/internal/setup"
"sigs.k8s.io/controller-runtime/pkg/predicate"
)

// TracePipelineReconciler reconciles a TracePipeline object
Expand All @@ -61,19 +62,24 @@ func (r *TracePipelineReconciler) SetupWithManager(mgr ctrl.Manager) error {
For(&telemetryv1alpha1.TracePipeline{}).
Watches(
&corev1.ConfigMap{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&appsv1.Deployment{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.Secret{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&corev1.Service{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&networkingv1.NetworkPolicy{},
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{})).
handler.EnqueueRequestForOwner(mgr.GetClient().Scheme(), mgr.GetRESTMapper(), &telemetryv1alpha1.TracePipeline{}),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
Watches(
&operatorv1alpha1.Telemetry{},
handler.EnqueueRequestsFromMapFunc(r.mapTelemetryChanges),
Expand Down

0 comments on commit e95aecb

Please sign in to comment.