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

Merge pull request #13663 from iPraveenParihar/fix/netNamespaceFilePath-generation

Browse Source 
csi: Fix NetNamespaceFilePath generation with namespace instead of name
This commit is contained in:
Travis Nielsen
2024-02-01 09:32:33 -07:00
committed by GitHub
parent e39ee8caba 67ff924b57
commit 60d6fe5362
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/file/subvolumegroup/controller.go
+1 -1
View File
@@ -299,7 +299,7 @@ func (r *ReconcileCephFilesystemSubVolumeGroup) updateClusterConfig(cephFilesyst
// If the cluster has Multus enabled we need to append the network namespace of the driver's
// holder DaemonSet in the csi configmap
if cephCluster.Spec.Network.IsMultus() {
netNamespaceFilePath, err := csi.GenerateNetNamespaceFilePath(r.opManagerContext, r.client, cephCluster.Name, r.opConfig.OperatorNamespace, csi.CephFSDriverShortName)
netNamespaceFilePath, err := csi.GenerateNetNamespaceFilePath(r.opManagerContext, r.client, cephCluster.Namespace, r.opConfig.OperatorNamespace, csi.CephFSDriverShortName)
if err != nil {
return errors.Wrap(err, "failed to generate cephfs net namespace file path")
}
pkg/operator/ceph/pool/radosnamespace/controller.go
+1 -1
View File
@@ -286,7 +286,7 @@ func (r *ReconcileCephBlockPoolRadosNamespace) updateClusterConfig(cephBlockPool
if cephCluster.Spec.Network.IsMultus() {
// Build the network namespace config to be injected into the csi config
netNamespaceFilePath, err := csi.GenerateNetNamespaceFilePath(r.opManagerContext, r.client, cephCluster.Name, r.opConfig.OperatorNamespace, csi.RBDDriverShortName)
netNamespaceFilePath, err := csi.GenerateNetNamespaceFilePath(r.opManagerContext, r.client, cephCluster.Namespace, r.opConfig.OperatorNamespace, csi.RBDDriverShortName)
if err != nil {
return errors.Wrap(err, "failed to generate rbd net namespace file path")
}