From: naman.gupta Date: Thu, 9 Nov 2023 17:08:26 +0000 (+0530) Subject: Delete resources when delete of CR is done. X-Git-Tag: 2.1.1~5 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F12029%2F1;p=ric-plt%2Fricdms.git Delete resources when delete of CR is done. Delete resources when delete of CR is done. Change-Id: Id44525346c28888d692c236eaf9025106ba121c8 Signed-off-by: naman.gupta --- diff --git a/xappKubernetesOperator/internal/controller/xappdep_controller.go b/xappKubernetesOperator/internal/controller/xappdep_controller.go index 74bb87a..38cee8d 100644 --- a/xappKubernetesOperator/internal/controller/xappdep_controller.go +++ b/xappKubernetesOperator/internal/controller/xappdep_controller.go @@ -39,6 +39,9 @@ func (r *XappDepReconciler) handle_deploy_using_generated_go_code(usage string) // return if usage == "create" { r.CreateAll() + } else { + r.DeleteAll() + } } //+kubebuilder:rbac:groups=depxapp.xapp.com,resources=xappdeps,verbs=get;list;watch;create;update;patch;delete @@ -87,6 +90,9 @@ func (r *XappDepReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct // The object is being deleted if controllerutil.ContainsFinalizer(instance, myFinalizerName) { // remove our finalizer from the list and update it. + logger.Info("--- Job is in Deletion state") + r.handle_deploy_using_generated_go_code("delete") + logger.Info("--- Job has been Delete") controllerutil.RemoveFinalizer(instance, myFinalizerName) if err := r.Update(ctx, instance); err != nil { return ctrl.Result{}, err