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

Merge pull request #16527 from rook/mergify/bp/release-1.18/pr-16516

Browse Source 
csi: Remove liveness probe setting from the csi-op (backport #16516)
This commit is contained in:
subham rai authored and GitHub committed 2025-09-23 12:26:50 +05:30
2 parents 971527d85b ae0dc30ccc
commit 682d9c8cb4
2 files changed
+4 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/operator/ceph/csi/operator_config.go
+4
View File
@@ -21,6 +21,7 @@ import (
csiopv1 "github.com/ceph/ceph-csi-operator/api/v1"
"github.com/pkg/errors"
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
k8scsiv1 "k8s.io/api/storage/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -103,6 +104,9 @@ func (r *ReconcileCSI) generateCSIOpConfigSpec(cluster cephv1.CephCluster, opCon
EnableSeLinuxHostMount: &CSIParam.EnablePluginSelinuxHostMount,
},
ControllerPlugin: &csiopv1.ControllerPluginSpec{
DeploymentStrategy: &appsv1.DeploymentStrategy{
Type: appsv1.RecreateDeploymentStrategyType,
},
PodCommonSpec: csiopv1.PodCommonSpec{
PrioritylClassName: &CSIParam.PluginPriorityClassName,
Affinity: &v1.Affinity{
pkg/operator/ceph/csi/operator_driver.go
-16
View File
@@ -95,9 +95,6 @@ func (r *ReconcileCSI) createOrUpdateRBDDriverResource(cluster cephv1.CephCluste
}
rbdDriver.Spec.ControllerPlugin.Resources = createDriverControllerPluginResources(rbdPluginResource)
rbdDriver.Spec.Liveness = &csiopv1.LivenessSpec{
MetricsPort: int(CSIParam.RBDLivenessMetricsPort),
}
rbdDriver.Spec.NodePlugin.Resources = createDriverNodePluginResouces(rbdProvisionerResource)
rbdDriver.Spec.NodePlugin.UpdateStrategy = &v1.DaemonSetUpdateStrategy{
Type: v1.RollingUpdateDaemonSetStrategyType,
@@ -148,9 +145,6 @@ func (r *ReconcileCSI) createOrUpdateCephFSDriverResource(cluster cephv1.CephClu
}
cephFsDriver.Spec.ControllerPlugin.Resources = createDriverControllerPluginResources(cephFSPluginResource)
cephFsDriver.Spec.Liveness = &csiopv1.LivenessSpec{
MetricsPort: int(CSIParam.CephFSLivenessMetricsPort),
}
cephFsDriver.Spec.NodePlugin.Resources = createDriverNodePluginResouces(cephFSProvisionerResource)
cephFsDriver.Spec.NodePlugin.UpdateStrategy = &v1.DaemonSetUpdateStrategy{
@@ -362,11 +356,6 @@ func createDriverControllerPluginResources(key string) csiopv1.ControllerPluginR
Limits: r.Resource.Limits,
Requests: r.Resource.Requests,
}
case strings.Contains(r.Name, "liveness"):
controllerPluginResources.Liveness = &corev1.ResourceRequirements{
Limits: r.Resource.Limits,
Requests: r.Resource.Requests,
}
case strings.Contains(r.Name, "addons"):
controllerPluginResources.Addons = &corev1.ResourceRequirements{
Limits: r.Resource.Limits,
@@ -394,11 +383,6 @@ func createDriverNodePluginResouces(key string) csiopv1.NodePluginResourcesSpec
Limits: r.Resource.Limits,
Requests: r.Resource.Requests,
}
} else if strings.Contains(r.Name, "liveness") {
nodePluginResources.Liveness = &corev1.ResourceRequirements{
Limits: r.Resource.Limits,
Requests: r.Resource.Requests,
}
} else if strings.Contains(r.Name, "addons") {
nodePluginResources.Addons = &corev1.ResourceRequirements{
Limits: r.Resource.Limits,