controllers: replicate odf tolerations to child subscriptions #368
Conversation
Signed-off-by: Nitin Goyal <[email protected]>
openshift-ci
bot
added
the
approved
|
/test odf-operator-e2e-aws |
iamniting
requested review from
jarrpa,
umangachapagain,
Nikhil-Ladha and
malayparida2000
| if odfSub.Spec.Config == nil { | ||
| odfSub.Spec.Config = &operatorv1alpha1.SubscriptionConfig{} | ||
| } |
There was a problem hiding this comment.
This is not needed. Do not update your own subscription.
There was a problem hiding this comment.
It is not gonna update. It is just to save from the panic in the below code.
| if actualSub != nil { | ||
| foundSubs := []string{actualSub.Name, sub.Name} | ||
| return nil, fmt.Errorf("multiple Subscriptions found for package '%s': %v", pkgName, foundSubs) | ||
| } | ||
| actualSub = &subsList.Items[i] | ||
| actualSub.Spec.Channel = desiredSubscription.Spec.Channel | ||
|
|
||
| // If the config is not set, only then set it to the desired value => allow user to override | ||
| if actualSub.Spec.Config == nil { | ||
| if actualSub.Spec.Config == nil && desiredSubscription.Spec.Config == nil { |
There was a problem hiding this comment.
Why not just update
odf-operator/controllers/subscriptions.go
Line 260 in 1969776
Add tolerations to desired subscription, and during reconcile merge actual and desired subs. Wouldn't that be simpler?
There was a problem hiding this comment.
Actually that will require extensive changes in the code, we will have to change the signature of multiple funcs.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: iamniting, umangachapagain The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test odf-operator-e2e-aws |
1 similar comment
|
/test odf-operator-e2e-aws |
openshift-merge-bot
bot
merged commit 9a4efc9
into
red-hat-storage:main
Signed-off-by: Nitin Goyal [email protected]