store catalogs in /var/cache/catalogs dir

Signed-off-by: Anik <anikbhattacharya93@gmail.com>
operator-framework · Aug 16, 2023 · 4e304f9 · 4e304f9
1 parent 9d60f83
commit 4e304f9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -47,8 +47,8 @@ spec:
         - "./manager"
         args:
         - --leader-elect
-        - "--catalogs-storage-dir=/var/cache"
-        - "--catalogs-server-port=:8083"
+        - "--catalogs-storage-dir=/var/cache/catalogs"
+        - "--catalogs-server-addr=127.0.0.1:8083"
         image: controller:latest
         name: manager
         ports:

diff --git a/pkg/controllers/core/catalog_controller.go b/pkg/controllers/core/catalog_controller.go
@@ -47,7 +47,7 @@ import (
 	"github.com/operator-framework/catalogd/pkg/storage"
 )
 
-const fbcDeletionFinalizer = "operator-framework.catalogd/localstore"
+const fbcDeletionFinalizer = "catalogd.operatorframework.io/delete-server-cache"
 
 // CatalogReconciler reconciles a Catalog object
 type CatalogReconciler struct {

diff --git a/pkg/controllers/core/catalog_controller_test.go b/pkg/controllers/core/catalog_controller_test.go
@@ -12,7 +12,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -156,13 +155,7 @@ var _ = Describe("Catalogd Controller Test", func() {
 
 			AfterEach(func() {
 				By("tearing down cluster state")
-				Eventually(func() error {
-					err := cl.Delete(ctx, catalog)
-					if !apierrors.IsNotFound(err) {
-						return err
-					}
-					return nil
-				}).Should(Succeed())
+				Expect(client.IgnoreNotFound(cl.Delete(ctx, catalog))).To(Succeed())
 			})
 
 			When("unpacker returns source.Result with state == 'Pending'", func() {

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -34,27 +34,20 @@ func (s *Storage) Store(owner string, fbc *declcfg.DeclarativeConfig) error {
 	if err := declcfg.WriteJSON(*fbc, fbcFile); err != nil {
 		return err
 	}
-	s.registerFileForServing(s.ServerMux, owner)
+	s.ServerMux.HandleFunc(fmt.Sprintf("/catalogs/%s", owner), func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, filepath.Join(s.RootDirectory, fmt.Sprintf("%s.json", owner)))
+	})
 	return nil
 }
 
 func (s *Storage) Delete(owner string) error {
-	return ignoreNotExist(os.Remove(s.fbcPath(owner)))
-}
-
-func (s *Storage) registerFileForServing(mux *http.ServeMux, name string) {
-	mux.HandleFunc(fmt.Sprintf("/catalogs/%s", name), func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, filepath.Join(s.RootDirectory, fmt.Sprintf("%s.json", name)))
-	})
-}
-
-func (s *Storage) fbcPath(catalogName string) string {
-	return filepath.Join(s.RootDirectory, fmt.Sprintf("%s.json", catalogName))
-}
-
-func ignoreNotExist(err error) error {
+	err := os.Remove(s.fbcPath(owner))
 	if errors.Is(err, os.ErrNotExist) {
 		return nil
 	}
 	return err
 }
+
+func (s *Storage) fbcPath(catalogName string) string {
+	return filepath.Join(s.RootDirectory, fmt.Sprintf("%s.json", catalogName))
+}