@@ -887,8 +887,6 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
887
887
// get the set of sources that should be used for resolution and best-effort get their connections working
888
888
logger .Debug ("resolving sources" )
889
889
890
- querier := NewNamespaceSourceQuerier (o .sources .AsClients (o .namespace , namespace ))
891
-
892
890
logger .Debug ("checking if subscriptions need update" )
893
891
894
892
subs , err := o .listSubscriptions (namespace )
@@ -921,7 +919,7 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
921
919
subscriptionUpdated = subscriptionUpdated || changedIP
922
920
923
921
// record the current state of the desired corresponding CSV in the status. no-op if we don't know the csv yet.
924
- sub , changedCSV , err := o .ensureSubscriptionCSVState (logger , sub , querier )
922
+ sub , changedCSV , err := o .ensureSubscriptionCSVState (logger , sub )
925
923
if err != nil {
926
924
logger .Debugf ("error recording current state of CSV in status: %v" , err )
927
925
return err
@@ -1105,7 +1103,7 @@ func (o *Operator) ensureSubscriptionInstallPlanState(logger *logrus.Entry, sub
1105
1103
return out , true , nil
1106
1104
}
1107
1105
1108
- func (o * Operator ) ensureSubscriptionCSVState (logger * logrus.Entry , sub * v1alpha1.Subscription , querier SourceQuerier ) (* v1alpha1.Subscription , bool , error ) {
1106
+ func (o * Operator ) ensureSubscriptionCSVState (logger * logrus.Entry , sub * v1alpha1.Subscription ) (* v1alpha1.Subscription , bool , error ) {
1109
1107
if sub .Status .CurrentCSV == "" {
1110
1108
return sub , false , nil
1111
1109
}
@@ -1116,10 +1114,6 @@ func (o *Operator) ensureSubscriptionCSVState(logger *logrus.Entry, sub *v1alpha
1116
1114
logger .WithError (err ).WithField ("currentCSV" , sub .Status .CurrentCSV ).Debug ("error fetching csv listed in subscription status" )
1117
1115
out .Status .State = v1alpha1 .SubscriptionStateUpgradePending
1118
1116
} else {
1119
- // Check if an update is available for the current csv
1120
- if err := querier .Queryable (); err != nil {
1121
- return nil , false , err
1122
- }
1123
1117
out .Status .State = v1alpha1 .SubscriptionStateAtLatest
1124
1118
out .Status .InstalledCSV = sub .Status .CurrentCSV
1125
1119
}
0 commit comments