Skip to content

Tolerate both opt.channel and opt.FallbackChannels for one operator #1098

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 2 commits into from
Nov 20, 2024
Merged

Tolerate both opt.channel and opt.FallbackChannels for one operator #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f905c6
Reconciliation will tolerate both opt.channel and opt.FallbackChannel…
Daniel-Fan Nov 18, 2024
ea741ca
trigger reconciliation when subscription annotation is updated
Daniel-Fan Nov 20, 2024
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
4 changes: 3 additions & 1 deletion controllers/operandrequest/operandrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,9 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
oldObject := e.ObjectOld.(*olmv1alpha1.Subscription)
newObject := e.ObjectNew.(*olmv1alpha1.Subscription)
if oldObject.Labels != nil && oldObject.Labels[constant.OpreqLabel] == "true" {
return (oldObject.Status.InstalledCSV != "" && newObject.Status.InstalledCSV != "" && oldObject.Status.InstalledCSV != newObject.Status.InstalledCSV)
statusToggle := (oldObject.Status.InstalledCSV != "" && newObject.Status.InstalledCSV != "" && oldObject.Status.InstalledCSV != newObject.Status.InstalledCSV)
metadataToggle := !reflect.DeepEqual(oldObject.Annotations, newObject.Annotations)
return statusToggle || metadataToggle
}
return false
},
Expand Down
5 changes: 4 additions & 1 deletion controllers/operandrequest/reconcile_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,12 @@ func (r *Reconciler) reconcileSubscription(ctx context.Context, requestInstance
sub.Spec.Channel = minChannel
}

channels := []string{opt.Channel}
if channels = append(channels, opt.FallbackChannels...); util.Contains(channels, sub.Spec.Channel) {
isMatchedChannel = true
}
// update the spec iff channel in sub matches channel
if sub.Spec.Channel == opt.Channel {
isMatchedChannel = true
sub.Spec.CatalogSource = opt.SourceName
sub.Spec.CatalogSourceNamespace = opt.SourceNamespace
sub.Spec.Package = opt.PackageName
Expand Down