Move to VerifySecret when checking the ctlplane secret, and other code consolidation #437
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
We have a number of places where we are using 5 seconds durations, 10 seconds duration, and requeue after 10 seconds. These are all "magic numbers" spread all over the operator code. This patch creates 2 constants and 1 variable (because golang doesn't allow it to be defined as a constant) for these so that they can be used throughout the code having defined the "magic numbers" in a single location.
Instead of recording a hash of the entire ctlplane secret, a new function is introduced that uses lib-common's VerifySecret() to verify and return the hash of only the cinder service's portion of the secret. This avoids restarting all cinder services when an unrelated portion of the ctlplane secret changes. This change follows a similar manila PR [1]. [1] openstack-k8s-operators/manila-operator#324 Jira: OSPRH-8192
Replace multiple calls to collect hashes of the Transport URL secret and other service configuration secrets with a new verifyConfigSecrets() function that can be shared by all cinder services. This also eliminates the need for each service to provide its own getSecret function. This change continues to mimic code in manila's PR [1]. [1] openstack-k8s-operators/manila-operator#324
|
/retest |
|
/test cinder-operator-build-deploy-kuttl |
/retest |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ASBishop, fmount 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 5d48463
into
openstack-k8s-operators:main
7 checks passed
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.
This PR consists of 3 commits:
See also openstack-k8s-operators/manila-operator#324