(bugfix): run bundle and run bundle-upgrade - update registry pod index directory and extraDeclConfig (operator-framework#5894)

* update registry pod index directory

The registry pod index directory now includes the CatalogSource name to prevent conflicts between indexes in the same directory

Signed-off-by: Bryce Palmer <[email protected]>

* copy channel from original and always add package

Signed-off-by: Bryce Palmer <[email protected]>

* copy Other metadata from original DC

Signed-off-by: Bryce Palmer <[email protected]>

Author: everettraven

internal/olm/operator/registry/fbcindex/fbc_registry_pod.go

@@ -81,7 +81,7 @@ func (f *FBCRegistryPod) init(cfg *operator.Configuration, cs *v1alpha1.CatalogS
 	}
 
 	if f.FBCIndexRootDir == "" {
-		f.FBCIndexRootDir = "/configs"
+		f.FBCIndexRootDir = fmt.Sprintf("/%s-configs", cs.Name)
 	}
 
 	f.cfg = cfg

internal/olm/operator/registry/index_image.go

@@ -246,6 +246,10 @@ func upgradeFBC(ctx context.Context, f *fbcutil.FBCContext, originalDeclCfg *dec
 		return nil, fmt.Errorf("bundle image should contain at least one bundle blob")
 	}
 
+	extraDeclConfig := &declarativeconfig.DeclarativeConfig{}
+	// declcfg contains all the bundles we need to insert to form the new FBC
+	entries := []declarativeconfig.ChannelEntry{} // Used when generating a new channel
+
 	// Checking if the existing file-based catalog (before upgrade) contains the bundle and channel that we intend to insert.
 	// If the bundle already exists, we error out. If the channel already exists, we store the index of the channel. This
 	// index will be used to access the channel from the declarative config object
@@ -270,6 +274,8 @@ func upgradeFBC(ctx context.Context, f *fbcutil.FBCContext, originalDeclCfg *dec
 				return nil, err
 			}
 
+			extraDeclConfig.Channels = append(extraDeclConfig.Channels, channel)
+
 			break // We only want to search through the specific channel
 		}
 	}
@@ -280,9 +286,6 @@ func upgradeFBC(ctx context.Context, f *fbcutil.FBCContext, originalDeclCfg *dec
 		existingBundles[bundle.Name] = bundle.Package
 	}
 
-	extraDeclConfig := &declarativeconfig.DeclarativeConfig{}
-	// declcfg contains all the bundles we need to insert to form the new FBC
-	entries := []declarativeconfig.ChannelEntry{} // Used when generating a new channel
 	for i, bundle := range declcfg.Bundles {
 		// if it is not present in the bundles array or belongs to a different package, we can add it
 		if _, present := existingBundles[bundle.Name]; !present || existingBundles[bundle.Name] != bundle.Package {
@@ -318,24 +321,16 @@ func upgradeFBC(ctx context.Context, f *fbcutil.FBCContext, originalDeclCfg *dec
 		extraDeclConfig.Channels = []declarativeconfig.Channel{channel}
 	}
 
-	// check if package already exists
-	packagePresent := false
-	for _, packageName := range originalDeclCfg.Packages {
-		if packageName.Name == f.Package {
-			packagePresent = true
-			break
-		}
+	// always add the package as we are starting with a new empty DeclarativeConfig
+	packageBlob := declarativeconfig.Package{
+		Schema:         fbcutil.SchemaPackage,
+		Name:           f.Package,
+		DefaultChannel: f.ChannelName,
 	}
+	extraDeclConfig.Packages = []declarativeconfig.Package{packageBlob}
 
-	// only add the new package if it does not already exist
-	if !packagePresent {
-		packageBlob := declarativeconfig.Package{
-			Schema:         fbcutil.SchemaPackage,
-			Name:           f.Package,
-			DefaultChannel: f.ChannelName,
-		}
-		extraDeclConfig.Packages = []declarativeconfig.Package{packageBlob}
-	}
+	// copy over any other FBC metadata
+	extraDeclConfig.Others = originalDeclCfg.Others
 
 	return extraDeclConfig, nil
 }