Standardize swift-ring finalizer name #231
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
/test swift-operator-build-deploy-kuttl |
stuggi
approved these changes
Jun 19, 2024
There was a problem hiding this comment.
/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
| @@ -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") { | |||
There was a problem hiding this comment.
when you bump lib-common you could use helper.GetFinalizer()
| @@ -122,7 +122,7 @@ function push() { | |||
| '${VERSION}' | |||
| "name":"'${CM_NAME}'", | |||
| "namespace":"'${NAMESPACE}'", | |||
| "finalizers": ["swift-ring/finalizer"], | |||
| "finalizers": ["openstack.org/swiftring"], | |||
There was a problem hiding this comment.
could use helper.GetFinalizer() when render this script template.
There was a problem hiding this comment.
Good point, indeed! Will change this in a follow up. Thx!
|
[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:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 252083b
into
openstack-k8s-operators:main
5 checks passed
stuggi
added a commit
to stuggi/openstack-operator
that referenced
this pull request
Jun 19, 2024
Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/barbican-operator#125 Depends-On: openstack-k8s-operators/cinder-operator#402 Depends-On: openstack-k8s-operators/designate-operator#178 Depends-On: openstack-k8s-operators/glance-operator#559 Depends-On: openstack-k8s-operators/heat-operator#380 Depends-On: openstack-k8s-operators/horizon-operator#332 Depends-On: openstack-k8s-operators/infra-operator#231 Depends-On: openstack-k8s-operators/ironic-operator#440 Depends-On: openstack-k8s-operators/keystone-operator#428 Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/manila-operator#287 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/neutron-operator#366 Depends-On: openstack-k8s-operators/nova-operator#794 Depends-On: openstack-k8s-operators/octavia-operator#330 Depends-On: openstack-k8s-operators/openstack-baremetal-operator#180 Depends-On: openstack-k8s-operators/ovn-operator#309 Depends-On: openstack-k8s-operators/placement-operator#215 Depends-On: openstack-k8s-operators/swift-operator#231 Depends-On: openstack-k8s-operators/telemetry-operator#414 Signed-off-by: Martin Schuppert <[email protected]>
stuggi
added a commit
to stuggi/openstack-operator
that referenced
this pull request
Jun 19, 2024
Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/barbican-operator#125 Depends-On: openstack-k8s-operators/cinder-operator#402 Depends-On: openstack-k8s-operators/designate-operator#178 Depends-On: openstack-k8s-operators/glance-operator#559 Depends-On: openstack-k8s-operators/heat-operator#380 Depends-On: openstack-k8s-operators/horizon-operator#332 Depends-On: openstack-k8s-operators/infra-operator#231 Depends-On: openstack-k8s-operators/ironic-operator#440 Depends-On: openstack-k8s-operators/keystone-operator#428 Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/manila-operator#287 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/neutron-operator#366 Depends-On: openstack-k8s-operators/nova-operator#794 Depends-On: openstack-k8s-operators/octavia-operator#330 Depends-On: openstack-k8s-operators/openstack-baremetal-operator#180 Depends-On: openstack-k8s-operators/ovn-operator#309 Depends-On: openstack-k8s-operators/placement-operator#215 Depends-On: openstack-k8s-operators/swift-operator#231 Depends-On: openstack-k8s-operators/telemetry-operator#414 Signed-off-by: Martin Schuppert <[email protected]>
stuggi
added a commit
to stuggi/openstack-operator
that referenced
this pull request
Jun 20, 2024
Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/barbican-operator#125 Depends-On: openstack-k8s-operators/cinder-operator#402 Depends-On: openstack-k8s-operators/designate-operator#178 Depends-On: openstack-k8s-operators/glance-operator#559 Depends-On: openstack-k8s-operators/heat-operator#380 Depends-On: openstack-k8s-operators/horizon-operator#332 Depends-On: openstack-k8s-operators/infra-operator#231 Depends-On: openstack-k8s-operators/ironic-operator#440 Depends-On: openstack-k8s-operators/keystone-operator#428 Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/manila-operator#287 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/neutron-operator#366 Depends-On: openstack-k8s-operators/nova-operator#794 Depends-On: openstack-k8s-operators/octavia-operator#330 Depends-On: openstack-k8s-operators/openstack-baremetal-operator#180 Depends-On: openstack-k8s-operators/ovn-operator#309 Depends-On: openstack-k8s-operators/placement-operator#215 Depends-On: openstack-k8s-operators/swift-operator#231 Depends-On: openstack-k8s-operators/telemetry-operator#414 Signed-off-by: Martin Schuppert <[email protected]>
stuggi
added a commit
to stuggi/openstack-operator
that referenced
this pull request
Jun 20, 2024
Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/barbican-operator#125 Depends-On: openstack-k8s-operators/cinder-operator#402 Depends-On: openstack-k8s-operators/designate-operator#178 Depends-On: openstack-k8s-operators/glance-operator#559 Depends-On: openstack-k8s-operators/heat-operator#380 Depends-On: openstack-k8s-operators/horizon-operator#332 Depends-On: openstack-k8s-operators/infra-operator#231 Depends-On: openstack-k8s-operators/ironic-operator#440 Depends-On: openstack-k8s-operators/keystone-operator#428 Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/manila-operator#287 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/neutron-operator#366 Depends-On: openstack-k8s-operators/nova-operator#794 Depends-On: openstack-k8s-operators/octavia-operator#330 Depends-On: openstack-k8s-operators/openstack-baremetal-operator#180 Depends-On: openstack-k8s-operators/ovn-operator#309 Depends-On: openstack-k8s-operators/placement-operator#215 Depends-On: openstack-k8s-operators/swift-operator#231 Depends-On: openstack-k8s-operators/telemetry-operator#414 Signed-off-by: Martin Schuppert <[email protected]>
stuggi
added a commit
to stuggi/openstack-operator
that referenced
this pull request
Jun 20, 2024
Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/barbican-operator#125 Depends-On: openstack-k8s-operators/cinder-operator#402 Depends-On: openstack-k8s-operators/designate-operator#178 Depends-On: openstack-k8s-operators/glance-operator#559 Depends-On: openstack-k8s-operators/heat-operator#380 Depends-On: openstack-k8s-operators/horizon-operator#332 Depends-On: openstack-k8s-operators/infra-operator#231 Depends-On: openstack-k8s-operators/ironic-operator#440 Depends-On: openstack-k8s-operators/keystone-operator#428 Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/manila-operator#287 Depends-On: openstack-k8s-operators/mariadb-operator#231 Depends-On: openstack-k8s-operators/neutron-operator#366 Depends-On: openstack-k8s-operators/nova-operator#794 Depends-On: openstack-k8s-operators/octavia-operator#330 Depends-On: openstack-k8s-operators/openstack-baremetal-operator#180 Depends-On: openstack-k8s-operators/ovn-operator#309 Depends-On: openstack-k8s-operators/placement-operator#215 Depends-On: openstack-k8s-operators/swift-operator#231 Depends-On: openstack-k8s-operators/telemetry-operator#414 Signed-off-by: Martin Schuppert <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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