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 main for ocs-operator #2854

Merged
merged 19 commits into from
Oct 18, 2024

Conversation

df-build-team
Copy link

PR containing the latest commits from main branch

malayparida2000 and others added 9 commits September 11, 2024 22:24
Initially in 4.13 when encryption in-transit was implemented we started
to use msgrv2 for internal mode only. External mode & Provider mode were
excluded.

For external mode the concern was the availability of msgrv2
port always on the RHCS cluster. But now we have reached ceph v18 &
msgrv2 is being by default on since ceph Nautilus 14.2. So we
can now use mgsr2 for external mode.

For provider mode the concern was availability of the required kernel
versions on old client clusters. But now that concern also seems no
longer valid. So we can now use msgrv2 for provider mode as well.

Also as we would always use msgrv2, we can now simplify the
GetCephFSKernelMountOptions function to remove the conditional checks.
If encryption is enabled use "secure" otherwise "prefer-crc".

Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
Earlier we were adding KMS details to CephCluster, CephObjectStore
Noobaa & metrics when Cluster wide encryption was enabled. But now
we are adding KMS details to these places when any of the deviceSet
is encrypted.

Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
Add option to enable encryption for particular deviceset & Add KMS details when any of the deviceSet is encrypted.
We are adding affinity to Noobaa if not in noobaa-standalone mode or
if placement is specified. But we are not clearing the affinity if
the affinity was set previously. This is breaking upgrade.

Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
Clear the affinity on Noobaa if it was set previously to handle upgrades
Signed-off-by: rchikatw <rchikatw@redhat.com>
@df-build-team df-build-team requested a review from a team October 15, 2024 07:40
change float32 to float64 in storageconsumer api
@Nikhil-Ladha
Copy link
Member

/retest

include the storageCluster UID and clientID to indentify the
storageConsumer from outside the cluster

Signed-off-by: Rewant Soni <resoni@redhat.com>
Signed-off-by: Rewant Soni <resoni@redhat.com>
Signed-off-by: Rewant Soni <resoni@redhat.com>
@Nikhil-Ladha
Copy link
Member

/retest

OdedViner and others added 3 commits October 16, 2024 11:38
Signed-off-by: Oded Viner <oviner@redhat.com>
controller: update the odf-info to include client identification info
@iamniting
Copy link
Member

/test ocs-operator-bundle-e2e-aws

openshift-merge-bot bot and others added 3 commits October 17, 2024 11:00
Use msgrv2 always for all ODF modes(internal,external,provider)
Signed-off-by: Malay Kumar Parida <mparida@redhat.com>
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2024
Copy link
Contributor

openshift-ci bot commented Oct 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 45a093f into release-4.18 Oct 18, 2024
23 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