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 #790

Merged
merged 12 commits into from
Dec 9, 2024

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream master branch

parth-gr and others added 9 commits December 4, 2024 18:08
we were adding the device class as the
disk rotational type, but device class
can be user defined, so if user has
added the device class, use that value

Signed-off-by: parth-gr <[email protected]>
This includes and is based on the changes of:

rook#14894

Co-authored-by: Blaine Gardner <[email protected]>
Co-authored-by: subhamkrai <[email protected]>
Signed-off-by: Michael Adam <[email protected]>

Fixes: rook#14894
currently device class and device type
labels were clubbed with eachother
create a seperate label, as these two labels
can be seperate

Signed-off-by: parth-gr <[email protected]>
GetOSDResources method was populating
wrong device class to get the osd
resources
This fix will fix the deviceClass label
for the GetOSDResources function

Signed-off-by: parth-gr <[email protected]>
the codegen ci workflow was previously fixed by copying the checkout dir
to the GOPATH. With the updated codegen tooling, this alignment is not a
requirement any more.

This simplifies the codegen workflow again by reverting the earlier
changes that added the copy mechanism.

This reverts commit 714f80a.
This reverts commit f32d3df.

Signed-off-by: Michael Adam <[email protected]>
osd: fix device class label on osd pod
Migrate OSDs to enable encryption as day-2 operation.

Signed-off-by: Santosh Pillai <[email protected]>
migrate OSDs to enable encryption as day-2 operation
@df-build-team df-build-team requested a review from a team December 6, 2024 08:06
@df-build-team df-build-team force-pushed the sync_us--master branch 2 times, most recently from 6fe4958 to eabb6af Compare December 8, 2024 08:06
Ceph Jenkins added 2 commits December 9, 2024 03:04
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2024
@subhamkrai subhamkrai added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2024
Copy link

openshift-ci bot commented Dec 9, 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 c9f6743 into master Dec 9, 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.

7 participants