Merge pull request #231 from cschwede/standardize-finalizer

Standardize swift-ring finalizer name
openstack-k8s-operators · Jun 19, 2024 · 252083b · 252083b
2 parents f03281e + 530db93
commit 252083b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/swiftring_controller.go b/controllers/swiftring_controller.go
@@ -255,7 +255,7 @@ func (r *SwiftRingReconciler) reconcileDelete(ctx context.Context, instance *swi
 	if err == nil {
 		// This finalizer is directly set when creating the ConfigMap using
 		// curl within the Job
-		if controllerutil.RemoveFinalizer(ringConfigMap, "swift-ring/finalizer") {
+		if controllerutil.RemoveFinalizer(ringConfigMap, "openstack.org/swiftring") {
 			err = r.Update(ctx, ringConfigMap)
 			if err != nil && !apierrors.IsNotFound(err) {
 				return ctrl.Result{}, err

diff --git a/templates/swiftring/bin/swift-ring-tool b/templates/swiftring/bin/swift-ring-tool
@@ -122,7 +122,7 @@ function push() {
             '${VERSION}'
             "name":"'${CM_NAME}'",
             "namespace":"'${NAMESPACE}'",
-            "finalizers": ["swift-ring/finalizer"],
+            "finalizers": ["openstack.org/swiftring"],
             "ownerReferences": [
                 {
                     "apiVersion": "'${OWNER_APIVERSION}'",