Skip to content

Commit 358b705

Browse files
Merge pull request #999 from camilamacedo86/cherry-pick-label
OCPBUGS-56034: fix(olm): improve error logging for missing olm.managed label (#3558)
2 parents ec31de8 + 44bc4d4 commit 358b705

File tree

2 files changed

+12
-2
lines changed
  • staging/operator-lifecycle-manager/pkg/controller/operators/labeller
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/labeller

2 files changed

+12
-2
lines changed

staging/operator-lifecycle-manager/pkg/controller/operators/labeller/filters.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"sync"
88

99
operators "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
10+
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
1011
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler"
1112
"github.com/sirupsen/logrus"
1213
"golang.org/x/sync/errgroup"
@@ -177,7 +178,11 @@ func Validate(ctx context.Context, logger *logrus.Logger, metadataClient metadat
177178
logger.WithFields(logrus.Fields{
178179
"gvr": gvr.String(),
179180
"nonconforming": count,
180-
}).Info("found nonconforming items")
181+
}).Errorf(
182+
"found nonconforming items: missing the the required label %q (metadata.labels[\"%s\"]=\"true\"). ",
183+
install.OLMManagedLabelKey,
184+
install.OLMManagedLabelKey,
185+
)
181186
}
182187
okLock.Lock()
183188
ok = ok && count == 0

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

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

0 commit comments

Comments
 (0)