Update catalogd API v1 imports

LalatenduMohanty · LalatenduMohanty · commit 3797748a9fbf · 2024-12-18T21:24:21.000-05:00
Signed-off-by: Lalatendu Mohanty &lt;lmohanty@redhat.com&gt;
diff --git a/catalogd/bin/linux/manager b/catalogd/bin/linux/manager
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -46,7 +46,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
diff --git a/internal/catalogmetadata/client/client.go b/internal/catalogmetadata/client/client.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 )
 
diff --git a/internal/catalogmetadata/client/client_test.go b/internal/catalogmetadata/client/client_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
diff --git a/internal/controllers/clustercatalog_controller.go b/internal/controllers/clustercatalog_controller.go
@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 )
 
 type CatalogCache interface {
diff --git a/internal/controllers/clustercatalog_controller_test.go b/internal/controllers/clustercatalog_controller_test.go
@@ -14,7 +14,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	"github.com/operator-framework/operator-controller/internal/controllers"
 	"github.com/operator-framework/operator-controller/internal/scheme"
diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go
@@ -45,7 +45,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
diff --git a/internal/resolve/catalog.go b/internal/resolve/catalog.go
@@ -15,7 +15,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
diff --git a/internal/resolve/catalog_test.go b/internal/resolve/catalog_test.go
@@ -16,7 +16,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 	"github.com/operator-framework/operator-registry/alpha/property"
 
diff --git a/internal/scheme/scheme.go b/internal/scheme/scheme.go
@@ -7,7 +7,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 )
diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/utils/env"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 )
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -13,7 +13,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	"github.com/operator-framework/operator-controller/internal/scheme"
 )
diff --git a/test/extension-developer-e2e/extension_developer_test.go b/test/extension-developer-e2e/extension_developer_test.go
@@ -18,7 +18,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 )
diff --git a/test/upgrade-e2e/post_upgrade_test.go b/test/upgrade-e2e/post_upgrade_test.go
@@ -18,7 +18,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	catalogd "github.com/operator-framework/catalogd/api/v1"
+	catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 )

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"k8s.io/apimachinery/pkg/api/meta"`
`13`	`13`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`14`	`14`
`15`		`- catalogd "github.com/operator-framework/catalogd/api/v1"`
	`15`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`16`	`16`	`"github.com/operator-framework/operator-registry/alpha/declcfg"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/log"`
`28`	`28`
`29`		`- catalogd "github.com/operator-framework/catalogd/api/v1"`
	`29`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`type CatalogCache interface {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`utilruntime "k8s.io/apimachinery/pkg/util/runtime"`
`8`	`8`	`clientgoscheme "k8s.io/client-go/kubernetes/scheme"`
`9`	`9`
`10`		`- catalogd "github.com/operator-framework/catalogd/api/v1"`
	`10`	`+ catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"`
`11`	`11`
`12`	`12`	`ocv1 "github.com/operator-framework/operator-controller/api/v1"`
`13`	`13`	`)`