Skip to content

Commit cc39d2c

Browse files
Merge pull request #597 from tmshort/small-sync
Small sync
2 parents 300a337 + 7b138da commit cc39d2c

File tree

3 files changed

+13
-6
lines changed
  • staging/operator-lifecycle-manager
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog

3 files changed

+13
-6
lines changed
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11

22
# approval == this is a good idea /approve
33
approvers:
4-
- ecordell
5-
- njhale
64
- kevinrizza
75
- benluddy
86
- awgreene
@@ -13,14 +11,11 @@ approvers:
1311
- tmshort
1412
# review == this code is good /lgtm
1513
reviewers:
16-
- ecordell
17-
- njhale
1814
- kevinrizza
1915
- benluddy
2016
- dinhxuanvu
2117
- gallettilance
2218
- anik120
23-
- exdx
2419
- awgreene
2520
- ankitathomas
2621
- joelanford
@@ -29,5 +24,5 @@ reviewers:
2924
- oceanc80
3025
- grokspawn
3126
- dtfranz
32-
- asmacdo
3327
- tmshort
28+
- stevekuznetsov

staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,6 +1102,12 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
11021102
return err
11031103
}
11041104

1105+
// If there are no subscriptions, don't attempt to sync the namespace.
1106+
if len(subs) == 0 {
1107+
logger.Debug(fmt.Sprintf("No subscriptions were found in namespace %v", namespace))
1108+
return nil
1109+
}
1110+
11051111
ogLister := o.lister.OperatorsV1().OperatorGroupLister().OperatorGroups(namespace)
11061112
failForwardEnabled, err := resolver.IsFailForwardEnabled(ogLister)
11071113
if err != nil {

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)