fix catalogd version variable paths in Makefile (operator-framework#1705)

Signed-off-by: Ankita Thomas <[email protected]>

[monorepo - phase 2] : Move the internal files from catalogd to operator-controller

Author: ankitathomas

catalogd/cmd/catalogd/main.go

@@ -20,6 +20,12 @@ import (
 	"crypto/tls"
 	"flag"
 	"fmt"
+	"github.com/operator-framework/operator-controller/internal/controllers/core"
+	"github.com/operator-framework/operator-controller/internal/garbagecollection"
+	catalogdmetrics "github.com/operator-framework/operator-controller/internal/metrics"
+	"github.com/operator-framework/operator-controller/internal/serverutil"
+	"github.com/operator-framework/operator-controller/internal/source"
+	"github.com/operator-framework/operator-controller/internal/webhook"
 	"log"
 	"net/url"
 	"os"
@@ -54,16 +60,10 @@ import (
 	crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	corecontrollers "github.com/operator-framework/operator-controller/catalogd/internal/controllers/core"
-	"github.com/operator-framework/operator-controller/catalogd/internal/features"
-	"github.com/operator-framework/operator-controller/catalogd/internal/garbagecollection"
-	catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
-	"github.com/operator-framework/operator-controller/catalogd/internal/serverutil"
-	"github.com/operator-framework/operator-controller/catalogd/internal/source"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
-	"github.com/operator-framework/operator-controller/catalogd/internal/version"
-	"github.com/operator-framework/operator-controller/catalogd/internal/webhook"
+	"github.com/operator-framework/operator-controller/internal/features"
 	"github.com/operator-framework/operator-controller/internal/fsutil"
+	"github.com/operator-framework/operator-controller/internal/storage"
+	"github.com/operator-framework/operator-controller/internal/version"
 )
 
 var (
@@ -127,7 +127,7 @@ func main() {
 	pflag.Parse()
 
 	if catalogdVersion {
-		fmt.Printf("%#v\n", version.Version())
+		fmt.Printf("%#v\n", version.String())
 		os.Exit(0)
 	}
 
@@ -324,7 +324,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&corecontrollers.ClusterCatalogReconciler{
+	if err = (&core.ClusterCatalogReconciler{
 		Client:   mgr.GetClient(),
 		Unpacker: unpacker,
 		Storage:  localStorage,
@@ -335,7 +335,7 @@ func main() {
 
 	if globalPullSecretKey != nil {
 		setupLog.Info("creating SecretSyncer controller for watching secret", "Secret", globalPullSecret)
-		err := (&corecontrollers.PullSecretReconciler{
+		err := (&core.PullSecretReconciler{
 			Client:       mgr.GetClient(),
 			AuthFilePath: authFilePath,
 			SecretKey:    *globalPullSecretKey,

catalogd/internal/features/features.go

@@ -21,25 +21,38 @@ rules:
   resources:
   - clustercatalogs
   verbs:
+  - create
+  - delete
   - get
   - list
+  - patch
+  - update
   - watch
 - apiGroups:
   - olm.operatorframework.io
   resources:
-  - clusterextensions
+  - clustercatalogs/finalizers
+  - clusterextensions/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - olm.operatorframework.io
+  resources:
+  - clustercatalogs/status
   verbs:
   - get
-  - list
   - patch
   - update
-  - watch
 - apiGroups:
   - olm.operatorframework.io
   resources:
-  - clusterextensions/finalizers
+  - clusterextensions
   verbs:
+  - get
+  - list
+  - patch
   - update
+  - watch
 - apiGroups:
   - olm.operatorframework.io
   resources:

catalogd/internal/version/version.go

@@ -20,6 +20,7 @@ import (
 	"context" // #nosec
 	"errors"
 	"fmt"
+	"github.com/operator-framework/operator-controller/internal/source"
 	"slices"
 	"sync"
 	"time"
@@ -38,8 +39,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/catalogd/internal/source"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
+	"github.com/operator-framework/operator-controller/internal/storage"
 )
 
 const (

config/base/rbac/role.yaml

@@ -4,6 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/operator-framework/operator-controller/internal/source"
+	"github.com/operator-framework/operator-controller/internal/storage"
 	"io/fs"
 	"net/http"
 	"testing"
@@ -21,8 +23,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/catalogd/internal/source"
-	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
 )
 
 var _ source.Unpacker = &MockSource{}

…ollers/core/clustercatalog_controller.go …ollers/core/clustercatalog_controller.gocatalogd/internal/controllers/core/clustercatalog_controller.go renamed to internal/controllers/core/clustercatalog_controller.go catalogd/internal/controllers/core/clustercatalog_controller.go renamed to internal/controllers/core/clustercatalog_controller.go

@@ -9,8 +9,13 @@ const (
 	// Add new feature gates constants (strings)
 	// Ex: SomeFeature featuregate.Feature = "SomeFeature"
 	PreflightPermissions featuregate.Feature = "PreflightPermissions"
+	APIV1QueryHandler                        = featuregate.Feature("APIV1QueryHandler")
 )
 
+var catalogdFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
+	APIV1QueryHandler: {Default: false, PreRelease: featuregate.Alpha},
+}
+
 var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	// Add new feature gate definitions
 	// Ex: SomeFeature: {...}
@@ -23,6 +28,10 @@ var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.Feature
 
 var OperatorControllerFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()
 
+var CatalogdFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()
+
 func init() {
 	utilruntime.Must(OperatorControllerFeatureGate.Add(operatorControllerFeatureGates))
+	utilruntime.Must(CatalogdFeatureGate.Add(catalogdFeatureGates))
+
 }