Skip to content

tolerate multi catalogsource for same service #914

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 1 commit into from
Mar 28, 2023
Merged

tolerate multi catalogsource for same service #914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions controllers/operandrequest/reconcile_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,6 @@ func (r *Reconciler) reconcileSubscription(ctx context.Context, requestInstance
sub.Annotations[requestInstance.Namespace+"."+requestInstance.Name+"."+operand.Name+"/request"] = sub.Spec.Channel
} else {

sub.Spec.CatalogSource = opt.SourceName
sub.Spec.CatalogSourceNamespace = opt.SourceNamespace
sub.Spec.Package = opt.PackageName

// check request annotation in subscription, get all available channels
var semverlList []string
reg, _ := regexp.Compile(`^(.*)\.(.*)\.(.*)\/request`)
Expand All @@ -225,12 +221,20 @@ func (r *Reconciler) reconcileSubscription(ctx context.Context, requestInstance
sub.Spec.Channel = semverlList[0]
}

if opt.InstallPlanApproval != "" && sub.Spec.InstallPlanApproval != opt.InstallPlanApproval {
sub.Spec.InstallPlanApproval = opt.InstallPlanApproval
}
if opt.SubscriptionConfig != nil {
sub.Spec.Config = opt.SubscriptionConfig
// update the spec iff channel in sub matches channel in opreg
if sub.Spec.Channel == opt.Channel {
sub.Spec.CatalogSource = opt.SourceName
sub.Spec.CatalogSourceNamespace = opt.SourceNamespace
sub.Spec.Package = opt.PackageName

if opt.InstallPlanApproval != "" && sub.Spec.InstallPlanApproval != opt.InstallPlanApproval {
sub.Spec.InstallPlanApproval = opt.InstallPlanApproval
}
if opt.SubscriptionConfig != nil {
sub.Spec.Config = opt.SubscriptionConfig
}
}

}
if compareSub(sub, originalSub) {
if err = r.updateSubscription(ctx, requestInstance, sub); err != nil {
Expand Down