diff --git a/pkg/k8shandler/collection.go b/pkg/k8shandler/collection.go index 607c9a07e2..a4ce8f86da 100644 --- a/pkg/k8shandler/collection.go +++ b/pkg/k8shandler/collection.go @@ -8,7 +8,6 @@ import ( "github.com/openshift/cluster-logging-operator/pkg/logger" "github.com/openshift/cluster-logging-operator/pkg/utils" - "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" @@ -127,13 +126,8 @@ func (clusterRequest *ClusterLoggingRequest) UpdateFluentdStatus() (err error) { return fmt.Errorf("Failed to get status of Fluentd: %v", err) } - printUpdateMessage := true retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error { if !compareFluentdCollectorStatus(fluentdStatus, cluster.Status.Collection.Logs.FluentdStatus) { - if printUpdateMessage { - logrus.Info("Updating status of Fluentd") - printUpdateMessage = false - } cluster.Status.Collection.Logs.FluentdStatus = fluentdStatus return clusterRequest.UpdateStatus(cluster) } diff --git a/pkg/k8shandler/curation.go b/pkg/k8shandler/curation.go index a53be8b5b3..050c09d324 100644 --- a/pkg/k8shandler/curation.go +++ b/pkg/k8shandler/curation.go @@ -55,14 +55,9 @@ func (clusterRequest *ClusterLoggingRequest) CreateOrUpdateCuration() (err error return fmt.Errorf("Failed to get status for Curator: %v", err) } - printUpdateMessage := true retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error { if !compareCuratorStatus(curatorStatus, cluster.Status.Curation.CuratorStatus) { - if printUpdateMessage { - logrus.Info("Updating status of Curator") - printUpdateMessage = false - } cluster.Status.Curation.CuratorStatus = curatorStatus return clusterRequest.UpdateStatus(cluster) } diff --git a/pkg/k8shandler/logstore.go b/pkg/k8shandler/logstore.go index 1ccbea8047..2a8cd70516 100644 --- a/pkg/k8shandler/logstore.go +++ b/pkg/k8shandler/logstore.go @@ -47,13 +47,8 @@ func (clusterRequest *ClusterLoggingRequest) CreateOrUpdateLogStore() (err error return fmt.Errorf("Failed to get Elasticsearch status for %q: %v", cluster.Name, err) } - printUpdateMessage := true retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error { if !compareElasticsearchStatus(elasticsearchStatus, cluster.Status.LogStore.ElasticsearchStatus) { - if printUpdateMessage { - logrus.Info("Updating status of Elasticsearch") - printUpdateMessage = false - } cluster.Status.LogStore.ElasticsearchStatus = elasticsearchStatus return clusterRequest.UpdateStatus(cluster) } diff --git a/pkg/k8shandler/visualization.go b/pkg/k8shandler/visualization.go index 73b8e22ab0..45e3a8277d 100644 --- a/pkg/k8shandler/visualization.go +++ b/pkg/k8shandler/visualization.go @@ -57,13 +57,8 @@ func (clusterRequest *ClusterLoggingRequest) UpdateKibanaStatus() (err error) { return } - printUpdateMessage := true retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error { if !compareKibanaStatus(kibanaStatus, clusterRequest.Cluster.Status.Visualization.KibanaStatus) { - if printUpdateMessage { - logrus.Info("Updating status of Kibana") - printUpdateMessage = false - } clusterRequest.Cluster.Status.Visualization.KibanaStatus = kibanaStatus return clusterRequest.UpdateStatus(clusterRequest.Cluster) }