Skip to content

Commit d447001

Browse files
stevekuznetsovci-robot
authored andcommitted
labeller: also consider v2 group in owner refs (#3138)
Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 4f56ce8f671b2f767a7aa45a67018513034a836c
1 parent 3eb4758 commit d447001

File tree

2 files changed

+4
-0
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

+4
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
1919
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
2020
operatorsv1alpha2 "github.com/operator-framework/api/pkg/operators/v1alpha2"
21+
operatorsv2 "github.com/operator-framework/api/pkg/operators/v2"
2122

2223
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
2324
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/decorators"
@@ -181,6 +182,7 @@ func HasOLMOwnerRef(object metav1.Object) bool {
181182
operatorsv1.GroupVersion,
182183
operatorsv1alpha1.SchemeGroupVersion,
183184
operatorsv1alpha2.GroupVersion,
185+
operatorsv2.GroupVersion,
184186
} {
185187
if ref.APIVersion == gv.String() {
186188
return true

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

Lines changed: 2 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)