From fe3794d2249c82798836c3c513aa67dba891161a Mon Sep 17 00:00:00 2001 From: YuChen Date: Wed, 23 Aug 2023 18:00:58 -0700 Subject: [PATCH 1/2] fix odlm permission issue due to missing opt ns Signed-off-by: YuChen --- controllers/operator/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } From 74808939ea87b60a016f3ca2e75053699d422647 Mon Sep 17 00:00:00 2001 From: YuChen Date: Thu, 24 Aug 2023 11:54:16 -0700 Subject: [PATCH 2/2] notfound error condition added Signed-off-by: YuChen --- controllers/operandrequest/operandrequest_controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) {