Fix a panic when reading annotations if the bundle is not there (openshift#255)

If the bundle is not present, the current bundleLoader will panic
when it gets to addChannelsFromAnnotationsFile. If the bundle is
nil, addChannelsFromAnnotationsFile should not attempt to do anything
so instead it just returns now.

Signed-off-by: Brad P. Crochet <[email protected]>

Signed-off-by: Brad P. Crochet <[email protected]>
Upstream-repository: api
Upstream-commit: 5f99430d4ec47d59daafa3b818229f0466531dea

Author: bcrochet

pkg/manifests/csv.yaml

@@ -5,7 +5,7 @@ metadata:
   name: packageserver
   namespace: openshift-operator-lifecycle-manager
   labels:
-    olm.version: 0.0.0-7829ec69880557119c98ba10ad52cb9264e4f278
+    olm.version: 0.0.0-a87009eda5ab6baceb10a162bd7950bbefc16cf3
     olm.clusteroperator.name: operator-lifecycle-manager-packageserver
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
                                 - packageserver
                         topologyKey: "kubernetes.io/hostname"
   maturity: alpha
-  version: 0.0.0-7829ec69880557119c98ba10ad52cb9264e4f278
+  version: 0.0.0-a87009eda5ab6baceb10a162bd7950bbefc16cf3
   apiservicedefinitions:
     owned:
       - group: packages.operators.coreos.com

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