Skip to content

make operatorconfig optional #733

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
merged 2 commits into from
Aug 17, 2021
Merged

make operatorconfig optional #733

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
c8cc5b9
make operatorconfig optional
ZhuoxiLi Aug 17, 2021
3f7c8ed
update the err msg & err check
ZhuoxiLi Aug 17, 2021
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
28 changes: 16 additions & 12 deletions controllers/operandrequest/reconcile_operand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,25 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
// Merge and Generate CR
if operand.Kind == "" {
configInstance, err := r.GetOperandConfig(ctx, registryKey)
if err != nil {
if err == nil {
// Check the requested Service Config if exist in specific OperandConfig
opdConfig := configInstance.GetService(operand.Name)
if opdConfig == nil {
klog.V(2).Infof("There is no service: %s from the OperandConfig instance: %s/%s, Skip creating CR for it", operand.Name, req.RegistryNamespace, req.Registry)
continue
}
err = r.reconcileCRwithConfig(ctx, opdConfig, opdRegistry.Namespace, csv)
if err != nil {
merr.Add(err)
requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)
}
} else if apierrors.IsNotFound(err) {
klog.Infof("Not Found OperandConfig: %s/%s", operand.Name, err)
} else if err != nil {
merr.Add(errors.Wrapf(err, "failed to get the OperandConfig %s", registryKey.String()))
continue
}
// Check the requested Service Config if exist in specific OperandConfig
opdConfig := configInstance.GetService(operand.Name)
if opdConfig == nil {
klog.V(2).Infof("There is no service: %s from the OperandConfig instance: %s/%s, Skip creating CR for it", operand.Name, req.RegistryNamespace, req.Registry)
continue
}
err = r.reconcileCRwithConfig(ctx, opdConfig, opdRegistry.Namespace, csv)
if err != nil {
merr.Add(err)
requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)
}

} else {
err = r.reconcileCRwithRequest(ctx, requestInstance, operand, types.NamespacedName{Name: requestInstance.Name, Namespace: requestInstance.Namespace}, i)
if err != nil {
Expand Down
6 changes: 5 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 @@ -368,7 +368,11 @@ func (r *Reconciler) absentOperatorsAndOperands(ctx context.Context, requestInst
}
configInstance, err := r.GetOperandConfig(ctx, registryKey)
if err != nil {
return err
if apierrors.IsNotFound(err) {
configInstance = &operatorv1alpha1.OperandConfig{}
} else {
return err
}
}
merr := &util.MultiErr{}
remainingOp := needDeletedOperands.Clone()
Expand Down