diff --git a/controllers/operandrequest/operandrequest_controller.go b/controllers/operandrequest/operandrequest_controller.go index bc8c0657..2c52b9f3 100644 --- a/controllers/operandrequest/operandrequest_controller.go +++ b/controllers/operandrequest/operandrequest_controller.go @@ -79,9 +79,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re defer func() { // get the latest instance from the server and check if the status has changed existingInstance := &operatorv1alpha1.OperandRequest{} - if err := r.Client.Get(ctx, req.NamespacedName, existingInstance); err != nil { + if err := r.Client.Get(ctx, req.NamespacedName, existingInstance); err != nil && !apierrors.IsNotFound(err) { // Error reading the latest object - requeue the request. - reconcileErr = utilerrors.NewAggregate([]error{reconcileErr, fmt.Errorf("error while get latest OperandRequest.Status from server: %v", err)}) + reconcileErr = utilerrors.NewAggregate([]error{reconcileErr, fmt.Errorf("c from server: %v", err)}) } if reflect.DeepEqual(existingInstance.Status, requestInstance.Status) { diff --git a/controllers/operator/manager.go b/controllers/operator/manager.go index f4e38e40..4530ee4f 100644 --- a/controllers/operator/manager.go +++ b/controllers/operator/manager.go @@ -87,7 +87,7 @@ func (m *ODLMOperator) GetOperandRegistry(ctx context.Context, key types.Namespa reg.Spec.Operators[i].Namespace = key.Namespace } if o.SourceName == "" || o.SourceNamespace == "" { - catalogSourceName, catalogSourceNs, err := m.GetCatalogSourceFromPackage(ctx, o.PackageName, o.Namespace, o.Channel, key.Namespace, excludedCatalogSources) + catalogSourceName, catalogSourceNs, err := m.GetCatalogSourceFromPackage(ctx, o.PackageName, reg.Spec.Operators[i].Namespace, o.Channel, key.Namespace, excludedCatalogSources) if err != nil { return nil, err }