helm: Remove duplicated toolbox keyring #13609
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
Removing whitespace for consistency and wrong indentation level. There's one actual "oopsie-fix" in here for CSI_ENABLE_READ_AFFINITY Signed-off-by: Erik Berg <erikberg@usit.uio.no>
We set `ceph_secret=${ROOK_CEPH_SECRET}` just a couple lines above,
and this duplicate is probably just an oversight.
This duplicate key is not present in the similar scripts in
examples/toolbox.yaml
examples/toolbox-operator-image.yaml
Signed-off-by: Erik Berg <erikberg@usit.uio.no>
travisn
approved these changes
Jan 23, 2024
| @@ -86,7 +86,6 @@ spec: | |||
| # create the keyring file | |||
| cat <<EOF > ${KEYRING_FILE} | |||
| [${ROOK_CEPH_USERNAME}] | |||
| key = ${ROOK_CEPH_SECRET} | |||
There was a problem hiding this comment.
Good catch, I see the toolbox.yaml example does not have this issue.
travisn
added a commit
that referenced
this pull request
Jan 23, 2024
helm: Remove duplicated toolbox keyring (backport #13609)
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 fixes a duplicated key in toolbox keyring, and possible invalid yaml for CSI_ENABLE_READ_AFFINITY. The other is just indentation level and whitespace, which didn't really warrant it's own PR.
Checklist: