feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #16396 from BlaineEXE/csi-fix-cephx-status-from-config

Browse Source 
csi: fix wrong use of daemon config for cephx status
This commit is contained in:
Blaine Gardner
2025-08-27 15:14:14 -06:00
committed by GitHub
parent b58689acbd 480b407bc2
commit b023eebc8c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/csi/secrets.go
+1 -1
View File
@@ -305,7 +305,7 @@ func updateCephStatusWithCephxStatus(context *clusterd.Context, clusterInfo *cli
namespacedName types.NamespacedName, didRotate bool, currentKeyCount int,
) error {
logger.Infof("updating cephCluster %s cephStatus with CSI cephxStatus in namespace %s", namespacedName.Name, namespacedName.Namespace)
cephxStatus := keyring.UpdatedCephxStatus(didRotate, cephCluster.Spec.Security.CephX.Daemon, clusterInfo.CephVersion, cephCluster.Status.Cephx.CSI.CephxStatus)
cephxStatus := keyring.UpdatedCephxStatus(didRotate, cephCluster.Spec.Security.CephX.CSI.CephxConfig, clusterInfo.CephVersion, cephCluster.Status.Cephx.CSI.CephxStatus)
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
cephCluster := &cephv1.CephCluster{}