Standardize swift-ring finalizer name #231

cschwede · 2024-06-18T17:38:02Z

The swift-ring finalizer is created by a curl API request and not using lib-common. This patch standardizes the finalizer name by adding the missing domain name.

Related: openstack-k8s-operators/lib-common#519

The swift-ring finalizer is created by a curl API request and not using lib-common. This patch standardizes the finalizer name by adding the missing domain name.

cschwede · 2024-06-18T21:10:55Z

/test swift-operator-build-deploy-kuttl

stuggi

/lgtm could use helper.GetFinalizer() to get the finalizer for the swiftring, but the current string aligns with the finalizer provided via the lib-common change we did openstack-k8s-operators/lib-common#519 . could do that in a follow up

stuggi · 2024-06-19T06:18:10Z

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") {


when you bump lib-common you could use helper.GetFinalizer()

stuggi · 2024-06-19T06:19:13Z

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"],


could use helper.GetFinalizer() when render this script template.

Good point, indeed! Will change this in a follow up. Thx!

openshift-ci · 2024-06-19T06:22:28Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cschwede, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [cschwede,stuggi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Standardize swift-ring finalizer name

530db93

The swift-ring finalizer is created by a curl API request and not using lib-common. This patch standardizes the finalizer name by adding the missing domain name.

openshift-ci bot requested review from frenzyfriday and viroel June 18, 2024 17:38

openshift-ci bot added the approved label Jun 18, 2024

cschwede requested a review from stuggi June 18, 2024 17:38

stuggi approved these changes Jun 19, 2024

View reviewed changes

openshift-ci bot assigned stuggi Jun 19, 2024

openshift-ci bot added the lgtm label Jun 19, 2024

openshift-merge-bot bot merged commit 252083b into openstack-k8s-operators:main Jun 19, 2024
5 checks passed

stuggi mentioned this pull request Jun 19, 2024

update finalzier to CRD doc openstack-k8s-operators/openstack-operator#867

Merged

cschwede deleted the standardize-finalizer branch July 30, 2024 06:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Standardize swift-ring finalizer name #231

Standardize swift-ring finalizer name #231

cschwede commented Jun 18, 2024

cschwede commented Jun 18, 2024

stuggi left a comment

stuggi Jun 19, 2024

stuggi Jun 19, 2024

cschwede Jun 19, 2024

openshift-ci bot commented Jun 19, 2024

Standardize swift-ring finalizer name #231

Standardize swift-ring finalizer name #231

Conversation

cschwede commented Jun 18, 2024

cschwede commented Jun 18, 2024

stuggi left a comment

Choose a reason for hiding this comment

stuggi Jun 19, 2024

Choose a reason for hiding this comment

stuggi Jun 19, 2024

Choose a reason for hiding this comment

cschwede Jun 19, 2024

Choose a reason for hiding this comment

openshift-ci bot commented Jun 19, 2024