@@ -10,7 +10,7 @@ import (
10
10
configv1 "github.com/openshift/api/config/v1"
11
11
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
12
12
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
13
- log "github.com/sirupsen/logrus"
13
+ "github.com/sirupsen/logrus"
14
14
corev1 "k8s.io/api/core/v1"
15
15
k8serrors "k8s.io/apimachinery/pkg/api/errors"
16
16
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,7 +33,8 @@ const (
33
33
installPlanResource = "installplans"
34
34
)
35
35
36
- func MonitorClusterStatus (name string , syncCh <- chan error , stopCh <- chan struct {}, opClient operatorclient.ClientInterface , configClient configv1client.ConfigV1Interface , crClient versioned.Interface ) {
36
+ func MonitorClusterStatus (name string , syncCh <- chan error , stopCh <- chan struct {}, opClient operatorclient.ClientInterface ,
37
+ configClient configv1client.ConfigV1Interface , crClient versioned.Interface , log * logrus.Logger ) {
37
38
var (
38
39
syncs int
39
40
successfulSyncs int
@@ -123,7 +124,7 @@ func MonitorClusterStatus(name string, syncCh <-chan error, stopCh <-chan struct
123
124
log .Errorf ("Failed to create cluster operator: %v\n " , createErr )
124
125
return
125
126
}
126
- created .Status .RelatedObjects , err = relatedObjects (name , opClient , crClient )
127
+ created .Status .RelatedObjects , err = relatedObjects (name , opClient , crClient , log )
127
128
if err != nil {
128
129
log .Errorf ("Failed to get related objects: %v" , err )
129
130
}
@@ -208,7 +209,7 @@ func MonitorClusterStatus(name string, syncCh <-chan error, stopCh <-chan struct
208
209
}
209
210
210
211
// always update the related objects in case changes have occurred
211
- existing .Status .RelatedObjects , err = relatedObjects (name , opClient , crClient )
212
+ existing .Status .RelatedObjects , err = relatedObjects (name , opClient , crClient , log )
212
213
if err != nil {
213
214
log .Errorf ("Failed to get related objects: %v" , err )
214
215
}
@@ -265,9 +266,9 @@ func findOperatorStatusCondition(conditions []configv1.ClusterOperatorStatusCond
265
266
266
267
// relatedObjects returns RelatedObjects in the ClusterOperator.Status.
267
268
// RelatedObjects are consumed by https://github.com/openshift/must-gather
268
- func relatedObjects (name string , opClient operatorclient.ClientInterface , crClient versioned.Interface ) ([]configv1.ObjectReference , error ) {
269
+ func relatedObjects (name string , opClient operatorclient.ClientInterface , crClient versioned.Interface , log * logrus. Logger ) ([]configv1.ObjectReference , error ) {
269
270
var objectReferences []configv1.ObjectReference
270
- log .Infof ("Adding related objects for %v" , name )
271
+ log .Debugf ("Adding related objects for %v" , name )
271
272
namespace := openshiftNamespace // hard-coded to constant
272
273
273
274
switch name {
0 commit comments