Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing latest changes from upstream master for rook #777

Merged
merged 6 commits into from
Nov 18, 2024

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream master branch

prazumovsky and others added 6 commits November 12, 2024 21:20
If host path keyring file exists and created during osd-prepare but not
imported to ceph auth then rook-ceph-osd activate init container will
create new keyring in ceph auth by ceph auth get-or-create command. To
avoid keyrings difference in host path and in ceph auth, consider
importing key from host path keyring file if no keyring found in ceph
auth.

Resolves: rook#14825
Signed-off-by: Peter Razumovsky <[email protected]>
Remove unnecessary if-else statement inside "if keyring file exists"
condition of osd activate script.

Resolves: rook#14825
Signed-off-by: Peter Razumovsky <[email protected]>
Add test to canary-integration-test scenarios which removes
osd auth and then recovers it on osd activation from keyring
file.

Resolves: rook#14825
Signed-off-by: Peter Razumovsky <[email protected]>
update the incstruction for where to run python script

Signed-off-by: parth-gr <[email protected]>
osd: import keyring file on activate to ceph auth if not imported yet
@df-build-team df-build-team requested a review from a team November 16, 2024 08:08
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 18, 2024
@subhamkrai subhamkrai added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 18, 2024
Copy link

openshift-ci bot commented Nov 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: df-build-team, subhamkrai

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 9ddd656 into master Nov 18, 2024
53 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants