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

csi: fix swapped provisionerPriorityClassName with pluginPriorityClassName

Browse Source 
Previously provisionerPriorityClassName config is applied to node plugin
but pluginPriorityClassName is applied to controller plugin. This causes
a misconfiguration since the default values for
provisionerPriorityClassName is system-cluster-critical and
pluginPriorityClassName is system-node-critical.

The default priority for node plugin ought to be system-node-critical so
we can leverage this information to kill the pods in this priority last,
allowing other pods that may mount RBD-backed volume to unmount cleanly
first, otherwise the shutdown sequence may hang due to failure
unmounting RBD-backed volume when the node plugin pod is already killed.

Signed-off-by: Sonny Sasaka <sonnysasaka@gmail.com>
This commit is contained in:
Sonny Sasaka
2026-04-16 08:30:28 -07:00
parent 9e15c6fe2d
commit dff04494fe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/csi/operator_config.go
+2 -2
View File
@@ -95,7 +95,7 @@ func (r *ReconcileCSI) generateCSIOpConfigSpec(cluster cephv1.CephCluster, opCon
FsGroupPolicy: k8scsiv1.FileFSGroupPolicy,
NodePlugin: &csiopv1.NodePluginSpec{
PodCommonSpec: csiopv1.PodCommonSpec{
PrioritylClassName: &CSIParam.ProvisionerPriorityClassName,
PrioritylClassName: &CSIParam.PluginPriorityClassName,
Affinity: &v1.Affinity{
NodeAffinity: getNodeAffinity(pluginNodeAffinityEnv, &v1.NodeAffinity{}),
},
@@ -112,7 +112,7 @@ func (r *ReconcileCSI) generateCSIOpConfigSpec(cluster cephv1.CephCluster, opCon
},
HostNetwork: &controllerPluginHostNetwork,
PodCommonSpec: csiopv1.PodCommonSpec{
PrioritylClassName: &CSIParam.PluginPriorityClassName,
PrioritylClassName: &CSIParam.ProvisionerPriorityClassName,
Affinity: &v1.Affinity{
NodeAffinity: getNodeAffinity(provisionerNodeAffinityEnv, &v1.NodeAffinity{}),
},
pkg/operator/ceph/csi/operator_driver.go
+2 -2
View File
@@ -273,7 +273,7 @@ func (r *ReconcileCSI) generateDriverSpec(cluster cephv1.CephCluster) (csiopv1.D
FsGroupPolicy: k8scsiv1.FileFSGroupPolicy,
NodePlugin: &csiopv1.NodePluginSpec{
PodCommonSpec: csiopv1.PodCommonSpec{
PrioritylClassName: &CSIParam.ProvisionerPriorityClassName,
PrioritylClassName: &CSIParam.PluginPriorityClassName,
Affinity: &corev1.Affinity{
NodeAffinity: getNodeAffinity(pluginNodeAffinityEnv, &corev1.NodeAffinity{}),
},
@@ -285,7 +285,7 @@ func (r *ReconcileCSI) generateDriverSpec(cluster cephv1.CephCluster) (csiopv1.D
},
ControllerPlugin: &csiopv1.ControllerPluginSpec{
PodCommonSpec: csiopv1.PodCommonSpec{
PrioritylClassName: &CSIParam.PluginPriorityClassName,
PrioritylClassName: &CSIParam.ProvisionerPriorityClassName,
Affinity: &corev1.Affinity{
NodeAffinity: getNodeAffinity(provisionerNodeAffinityEnv, &corev1.NodeAffinity{}),
},