OPRUN-2913: Sync from api repo 1

manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -129,6 +129,9 @@ spec:
                   type: integer
                 publisher:
                   type: string
+                runAsRoot:
+                  description: RunAsRoot allows admins to indicate that they wish to run the CatalogSource pod in a privileged pod as root.  This should only be enabled when running older catalog images which could not be run as non-root.
+                  type: boolean
                 secrets:
                   description: Secrets represent set of secrets that can be used to access the contents of the catalog. It is best to keep this list small, since each will need to be tried for every catalog entry.
                   type: array

staging/api/crds/operators.coreos.com_catalogsources.yaml

@@ -127,6 +127,9 @@ spec:
                   type: integer
                 publisher:
                   type: string
+                runAsRoot:
+                  description: RunAsRoot allows admins to indicate that they wish to run the CatalogSource pod in a privileged pod as root.  This should only be enabled when running older catalog images which could not be run as non-root.
+                  type: boolean
                 secrets:
                   description: Secrets represent set of secrets that can be used to access the contents of the catalog. It is best to keep this list small, since each will need to be tried for every catalog entry.
                   type: array

staging/api/pkg/manifests/bundleloader.go

@@ -51,6 +51,10 @@ func (b *bundleLoader) LoadBundle() error {
 
 // Add values from the annotations when the values are not loaded
 func (b *bundleLoader) addChannelsFromAnnotationsFile() {
+	if b.bundle == nil {
+		// None of this is relevant if the bundle was not found
+		return
+	}
 	// Note that they will not get load for Bundle Format directories
 	// and PackageManifest should not have the annotationsFile. However,
 	// the following check to ensure that channels and default channels

staging/api/pkg/operators/v1alpha1/catalogsource_types.go

@@ -89,6 +89,11 @@ type CatalogSourceSpec struct {
 	// +optional
 	Secrets []string `json:"secrets,omitempty"`
 
+	// RunAsRoot allows admins to indicate that they wish to run the CatalogSource pod in a privileged
+	// pod as root.  This should only be enabled when running older catalog images which could not be run as non-root.
+	// +optional
+	RunAsRoot bool `json:"runAsRoot,omitempty"`
+
 	// Metadata
 	DisplayName string `json:"displayName,omitempty"`
 	Description string `json:"description,omitempty"`