Skip to content

add_service_db_finalizer_deletion in ReconcileDelete #57

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

Closed
wants to merge 1 commit into from
Closed

add_service_db_finalizer_deletion in ReconcileDelete #57

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
15 changes: 15 additions & 0 deletions controllers/cinderapi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ import (
"github.com/openstack-k8s-operators/lib-common/modules/common/labels"
"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
"github.com/openstack-k8s-operators/lib-common/modules/common/util"

database "github.com/openstack-k8s-operators/lib-common/modules/database"
)

// GetClient -
Expand Down Expand Up @@ -253,6 +255,19 @@ func (r *CinderAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
func (r *CinderAPIReconciler) reconcileDelete(ctx context.Context, instance *cinderv1beta1.CinderAPI, helper *helper.Helper) (ctrl.Result, error) {
r.Log.Info(fmt.Sprintf("Reconciling Service '%s' delete", instance.Name))

// remove db finalizer
serviceDb, err := database.GetServiceDbByName(ctx, helper, instance.Name, instance.Namespace)
if err != nil && !k8s_errors.IsNotFound(err) {
return ctrl.Result{}, err
}
if err == nil {
controllerutil.RemoveFinalizer(serviceDb, helper.GetFinalizer())
if err = helper.GetClient().Update(ctx, serviceDb); err != nil && !k8s_errors.IsNotFound(err) {
return ctrl.Result{}, err
}
util.LogForObject(helper, "Removed finalizer from our CinderAPI database", instance)
}

// It's possible to get here before the endpoints have been set in the status, so check for this
if instance.Status.APIEndpoints != nil {
for _, ksSvc := range keystoneServices {
Expand Down