Skip to content

skip sub updating for discontinued services #910

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 7 commits into from
Mar 16, 2023
Merged

skip sub updating for discontinued services #910

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5b5aae
skip sub updating for discontinued services
Mar 15, 2023
281f067
update annotations only
Mar 15, 2023
9fee386
typo
Mar 15, 2023
24667f5
update opreq annotation
Mar 15, 2023
6792326
update annotation channel
Mar 16, 2023
4f53123
fix go fmt
Mar 16, 2023
0c5204f
set annotation when installmode is no-op
Mar 16, 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
update annotations only 
Signed-off-by: YuChen <[email protected]>
  • Loading branch information
YuChen committed Mar 15, 2023
commit 281f067a659987bec9318435b9b6a39d6217d251
74 changes: 39 additions & 35 deletions controllers/operandrequest/reconcile_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,46 +196,50 @@ func (r *Reconciler) reconcileSubscription(ctx context.Context, requestInstance
sub.Annotations[registryKey.Namespace+"."+registryKey.Name+"/config"] = "true"
sub.Annotations[requestInstance.Namespace+"."+requestInstance.Name+"."+operand.Name+"/request"] = opt.Channel

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`)
for anno, channel := range sub.Annotations {
if reg.MatchString(anno) && semver.IsValid(channel) {
semverlList = append(semverlList, channel)
if opt.InstallMode == operatorv1alpha1.InstallModeNoop {
requestInstance.SetNoSuitableRegistryCondition(registryKey.String(), opt.Name+" is in maintenance status", operatorv1alpha1.ResourceTypeOperandRegistry, corev1.ConditionTrue, &r.Mutex)
requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorRunning, operatorv1alpha1.ServiceRunning, mu)
} 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`)
for anno, channel := range sub.Annotations {
if reg.MatchString(anno) && semver.IsValid(channel) {
semverlList = append(semverlList, channel)
}
}
if len(semverlList) == 0 {
// channel is not valid semantic version
sub.Spec.Channel = opt.Channel
} else if !util.Contains(semverlList, sub.Spec.Channel) {
// upgrade channel to minimal version existing in annotation
sort.Sort(semver.ByVersion(semverlList))
sub.Spec.Channel = semverlList[0]
}
}
if len(semverlList) == 0 {
// channel is not valid semantic version
sub.Spec.Channel = opt.Channel
} else if !util.Contains(semverlList, sub.Spec.Channel) {
// upgrade channel to minimal version existing in annotation
sort.Sort(semver.ByVersion(semverlList))
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
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 opt.InstallMode == operatorv1alpha1.InstallModeNoop {
requestInstance.SetNoSuitableRegistryCondition(registryKey.String(), opt.Name+" is in maintenance status", operatorv1alpha1.ResourceTypeOperandRegistry, corev1.ConditionTrue, &r.Mutex)
requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorRunning, operatorv1alpha1.ServiceRunning, mu)
} else {
// Subscription updates for not discontinued services
if err = r.updateSubscription(ctx, requestInstance, sub); err != nil {
requestInstance.SetMemberStatus(opt.Name, operatorv1alpha1.OperatorFailed, "", mu)
return err
}
requestInstance.SetMemberStatus(opt.Name, operatorv1alpha1.OperatorUpdating, "", mu)
}
if err = r.updateSubscription(ctx, requestInstance, sub); err != nil {
requestInstance.SetMemberStatus(opt.Name, operatorv1alpha1.OperatorFailed, "", mu)
return err
}

// Subscription updates for not discontinued services
if err = r.updateSubscription(ctx, requestInstance, sub); err != nil {
requestInstance.SetMemberStatus(opt.Name, operatorv1alpha1.OperatorFailed, "", mu)
return err
}
requestInstance.SetMemberStatus(opt.Name, operatorv1alpha1.OperatorUpdating, "", mu)
} else {
// Subscription existing and not managed by OperandRequest controller
klog.V(1).Infof("Subscription %s in namespace %s isn't created by ODLM. Ignore update/delete it.", sub.Name, sub.Namespace)
Expand Down