Skip to content

Commit 7ed2d9e

Browse files
committed
remove duplicate import
1 parent dafb9fd commit 7ed2d9e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

pkg/controller/operators/olm/operator.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
kagg "k8s.io/kube-aggregator/pkg/client/informers/externalversions"
3232

3333
"github.com/operator-framework/api/pkg/operators/v1alpha1"
34-
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
3534
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
3635
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/informers/externalversions"
3736
operatorsv1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
@@ -1271,7 +1270,7 @@ func (a *Operator) syncCopyCSV(obj interface{}) (syncError error) {
12711270
return
12721271
}
12731272

1274-
requirement, err := labels.NewRequirement(operatorsv1alpha1.CopiedLabelKey, selection.Equals, []string{clusterServiceVersion.Namespace})
1273+
requirement, err := labels.NewRequirement(v1alpha1.CopiedLabelKey, selection.Equals, []string{clusterServiceVersion.Namespace})
12751274
if err != nil {
12761275
return err
12771276
}
@@ -1324,7 +1323,7 @@ func (a *Operator) isCSVCopyingEnabled() (bool, error) {
13241323
return a.isCopiedCSVsEnabled, nil
13251324
}
13261325

1327-
func (a *Operator) getCopiedCSVDisabledEventsForCSV(csv *operatorsv1alpha1.ClusterServiceVersion) ([]corev1.Event, error) {
1326+
func (a *Operator) getCopiedCSVDisabledEventsForCSV(csv *v1alpha1.ClusterServiceVersion) ([]corev1.Event, error) {
13281327
result := []corev1.Event{}
13291328
if csv == nil {
13301329
return result, nil
@@ -1347,7 +1346,7 @@ func (a *Operator) getCopiedCSVDisabledEventsForCSV(csv *operatorsv1alpha1.Clust
13471346
return result, nil
13481347
}
13491348

1350-
func (a *Operator) deleteCSVCopyingDisabledEvent(csv *operatorsv1alpha1.ClusterServiceVersion) error {
1349+
func (a *Operator) deleteCSVCopyingDisabledEvent(csv *v1alpha1.ClusterServiceVersion) error {
13511350
events, err := a.getCopiedCSVDisabledEventsForCSV(csv)
13521351
if err != nil {
13531352
return err
@@ -1367,7 +1366,7 @@ func (a *Operator) deleteEvents(events []corev1.Event) error {
13671366
return nil
13681367
}
13691368

1370-
func (a *Operator) createCSVCopyingDisabledEvent(csv *operatorsv1alpha1.ClusterServiceVersion) error {
1369+
func (a *Operator) createCSVCopyingDisabledEvent(csv *v1alpha1.ClusterServiceVersion) error {
13711370
events, err := a.getCopiedCSVDisabledEventsForCSV(csv)
13721371
if err != nil {
13731372
return err

0 commit comments

Comments
 (0)