Skip to content

Bug 1892794: Remove status update message #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2020
Merged

Bug 1892794: Remove status update message #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pkg/k8shandler/collection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down
5 changes: 0 additions & 5 deletions pkg/k8shandler/curation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
5 changes: 0 additions & 5 deletions pkg/k8shandler/logstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
5 changes: 0 additions & 5 deletions pkg/k8shandler/visualization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down