Skip to content

Update test case #927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibm-ci-bot merged 8 commits into from
May 18, 2023
Merged

Update test case #927

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ee70dc
Update Kind cluster version
Daniel-Fan May 11, 2023
6febe70
Update OLM version and install script to v0.24.0
Daniel-Fan May 11, 2023
288a4da
update test cases
Daniel-Fan May 15, 2023
4024ccb
update CRD template
Daniel-Fan May 15, 2023
7e9a739
set owner reference for CR created by OpReq
Daniel-Fan May 15, 2023
65005c5
Update error msg
Daniel-Fan May 15, 2023
3357c1b
Update go mod
Daniel-Fan May 15, 2023
25f2381
Update Makefile to build bundle and catalog image
Daniel-Fan May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
set owner reference for CR created by OpReq 
Signed-off-by: Daniel Fan <[email protected]>
  • Loading branch information
@Daniel-Fan
Daniel-Fan committed May 15, 2023
commit 7e9a739c9172cc2f99843ff26fe8cf97320e1f8c
5 changes: 5 additions & 0 deletions controllers/operandrequest/reconcile_operand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/discovery"
"k8s.io/klog"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
constant "github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
Expand Down Expand Up @@ -380,6 +381,10 @@ func (r *Reconciler) reconcileCRwithRequest(ctx context.Context, requestInstance
crFromRequest.SetNamespace(requestKey.Namespace)
crFromRequest.SetAPIVersion(operand.APIVersion)
crFromRequest.SetKind(operand.Kind)
// Set the OperandRequest as the controller of the CR from request
if err := controllerutil.SetControllerReference(requestInstance, &crFromRequest, r.Scheme); err != nil {
merr.Add(errors.Wrapf(err, "failed to set ownerReference for custom resource %s/%s", requestKey.Namespace, name))
}

err := r.Client.Get(ctx, types.NamespacedName{
Name: name,
Expand Down