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

Merged
merged 12 commits into from
Apr 22, 2024
Merged

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream master branch

travisn and others added 7 commits April 18, 2024 10:26
The metadata and data block pools for an EC block pool
were switched, causing issues with the EC configuration.
Now the metadata and data pool settings are correct
in the helm chart.

Signed-off-by: Travis Nielsen <[email protected]>
There have been some issues with non-CSI Rook controllers that are
creating the CSI config configmap (`rook-ceph-csi-config`). This causes
problems with the K8s OwnerReference. The primary CSI reconciler
(controller) creates the configmap with the correct owner reference,
which is supposed to be the operator deployment.

Other instances were creating the configmap with owner references set to
the CephCluster. This is a minor bug, but it can result in this
configmap being deleted along with the first CephCluster that initially
created it.

To fix this issue, remove all instances of `CreateCsiConfigMap()` except
the single usage which the CSI reconcile uses to initially create the
configmap. Other controllers that might have attempted to create this
configmap previously will return an error indicating that it is waiting
for the configmap to be created.

Signed-off-by: Blaine Gardner <[email protected]>
In the primary CSI reconcile, ensure the CSI config map
(`rook-ceph-csi-config`) has the correct owner info.

This corrects any pre-existing config maps that might have incorrect
owner info, which has observed to include references to CephClusters.
The config map should only have a single reference, and it should refer
to the operator deployment.

If any existing Rook clusters have a CSI config map which has a
CephCluster as an owner, this change will ensure that the config map is
not deleted when the CephCluster is deleted. This is especially
important for any environments with multiple CephClusters installed.

Signed-off-by: Blaine Gardner <[email protected]>
…ators

csi: only create CSI config configmap in CSI reconciler
helm: Use correct metadata and data ec block pool
adding support for kubernetes 1.30 in ci which released yesterday.

Signed-off-by: subhamkrai <[email protected]>
@df-build-team df-build-team requested a review from a team April 19, 2024 08:02
Copy link

openshift-ci bot commented Apr 19, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

The full list of commands accepted by this bot can be found 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

travisn and others added 5 commits April 19, 2024 09:07
With the update to run CI on K8s 1.30, we update the
mergify auto merge rules for the 1.14 branch.

Signed-off-by: Travis Nielsen <[email protected]>
Mergify is not auto-merging 1.14 backport PRs. All tests
appear to match the mergify definition perfectly, but
the canary-tests prefix is also needed on the tests
for proper merge.

Signed-off-by: Travis Nielsen <[email protected]>
ci: Update mergify rules for K8s 1.30
OSDs on LVM-mode PVCs are failing to come up and crashing
in the expand-bluefs init container. To avoid the crash
and allow the OSDs to start, a workaround was found to
simply remove that init container. Now we disable the
OSD resize for this case to avoid others hitting this
during upgrade as well.

Signed-off-by: Travis Nielsen <[email protected]>
osd: Legacy LVM-based OSDs on PVCs crash on resize init container
@travisn travisn merged commit 2846830 into master Apr 22, 2024
50 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants