Skip to content

refactor no olm controller code to handle cleanup on operandrequest deletion #1108

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
bitscuit merged 11 commits into from
Feb 4, 2025
Merged

refactor no olm controller code to handle cleanup on operandrequest deletion #1108

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4b541f4
refactor no olm controller code to handle deletion
bluzarraga Jan 31, 2025
d2a6185
cleanup
bluzarraga Jan 31, 2025
0e2967b
update build params for testing
bluzarraga Jan 31, 2025
3e360d8
update controller to watch configmap changes
bluzarraga Feb 3, 2025
d680360
add watched by odlm label
bluzarraga Feb 3, 2025
2ffafeb
add debugging statements
bluzarraga Feb 3, 2025
3c3b79f
more debugging logs
bluzarraga Feb 3, 2025
b914f6e
more debug statements
bluzarraga Feb 4, 2025
5a04795
remove user managed condition
bluzarraga Feb 4, 2025
abaabf1
debug statements
bluzarraga Feb 4, 2025
920800f
disable, edit debugging statements
bluzarraga Feb 4, 2025
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
debug statements 
Signed-off-by: Ben Luzarraga <[email protected]>
  • Loading branch information
@bluzarraga
bluzarraga committed Feb 4, 2025
commit abaabf1cc14094a999bc51da4d98885db3c2bdc9
9 changes: 7 additions & 2 deletions controllers/operandrequestnoolm/reconcile_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,10 @@ func (r *Reconciler) uninstallOperatorsAndOperands(ctx context.Context, operandN
// }

cm, err := r.GetOpReqCM(ctx, op.Name, deploy.Namespace, registryInstance.Namespace, op.PackageName)
klog.V(1).Info("Configmap tracking operand: ", cm.Name)
if cm != nil && err == nil {
uninstallOperator, uninstallOperand := checkOpReqCMAnnotationsForUninstall(requestInstance.ObjectMeta.Name, requestInstance.ObjectMeta.Namespace, op.Name, op.InstallMode, cm)
klog.V(1).Info("uinstall operator: ", uninstallOperator, " uninstall operand: ", uninstallOperand)
if !uninstallOperand && !uninstallOperator {
if err = r.updateOpReqCM(ctx, requestInstance, cm); err != nil {
requestInstance.SetMemberStatus(op.Name, operatorv1alpha1.OperatorFailed, "", &r.Mutex)
Expand Down Expand Up @@ -538,7 +540,8 @@ func (r *Reconciler) generateClusterObjects(o *operatorv1alpha1.Operator, regist
klog.V(3).Info("Generating Cluster Objects")
co := &clusterObjects{}
labels := map[string]string{
constant.OpreqLabel: "true",
constant.OpreqLabel: "true",
"operator.ibm.com/watched-by-odlm": "true",
}

klog.V(3).Info("Generating Namespace: ", o.Namespace)
Expand All @@ -562,6 +565,7 @@ func (r *Reconciler) generateClusterObjects(o *operatorv1alpha1.Operator, regist
registryKey.Namespace + "." + registryKey.Name + "/config": "true",
requestKey.Namespace + "." + requestKey.Name + "." + o.Name + "/request": o.Channel,
requestKey.Namespace + "." + requestKey.Name + "." + o.Name + "/operatorNamespace": namespace,
"packageName": o.PackageName,
}

//CM object
Expand All @@ -576,7 +580,7 @@ func (r *Reconciler) generateClusterObjects(o *operatorv1alpha1.Operator, regist
}

cm.SetGroupVersionKind(schema.GroupVersionKind{Group: corev1.SchemeGroupVersion.Group, Kind: "Configmap", Version: corev1.SchemeGroupVersion.Version})
klog.V(3).Info("Generating Configmap: ", o.PackageName, " in the Namespace: ", namespace)
klog.V(1).Info("Generating Configmap: ", o.PackageName, " in the Namespace: ", namespace)
co.configmap = cm
return co
}
Expand Down Expand Up @@ -606,6 +610,7 @@ func checkOpReqCMAnnotationsForUninstall(reqName, reqNs, opName, installMode str
uninstallOperator := true
uninstallOperand := true

klog.V(1).Info("checking cm for operand: ", opName)
delete(cm.Annotations, reqNs+"."+reqName+"."+opName+"/request")
delete(cm.Annotations, reqNs+"."+reqName+"."+opName+"/operatorNamespace")

Expand Down