From 7472cfd9fa776caabf8c1c5f3e8b1306366a9153 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 27 Jan 2021 14:52:34 -0700 Subject: [PATCH] ceph: enable pod disruption budgets by default The PDBs have been stabilizing for a good length of time now since they were created in v1.1, and later redesigned in v1.5. The time has come to enable the feature by default so everyone can enjoy the stable Rook storage even while draining K8s nodes. Signed-off-by: Travis Nielsen --- PendingReleaseNotes.md | 1 + cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml | 2 +- cluster/examples/kubernetes/ceph/cluster-stretched.yaml | 2 ++ cluster/examples/kubernetes/ceph/cluster-test.yaml | 2 ++ cluster/examples/kubernetes/ceph/cluster-with-drive-groups.yaml | 2 ++ cluster/examples/kubernetes/ceph/cluster.yaml | 2 +- tests/framework/installer/ceph_manifests.go | 2 +- 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 40ab61462..46623f054 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -18,3 +18,4 @@ v1.6... * CephClient CRD has been converted to use the controller-runtime library * Extending the support of vault KMS configuration for Ceph RGW +* Enable disruption budgets (PDBs) by default for Mon, RGW, MDS, and OSD daemons diff --git a/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml b/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml index ea605c04d..2050e3926 100644 --- a/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml @@ -166,7 +166,7 @@ spec: # cpu: "200m" # memory: "200Mi" disruptionManagement: - managePodBudgets: false + managePodBudgets: true osdMaintenanceTimeout: 30 pgHealthCheckTimeout: 0 manageMachineDisruptionBudgets: false diff --git a/cluster/examples/kubernetes/ceph/cluster-stretched.yaml b/cluster/examples/kubernetes/ceph/cluster-stretched.yaml index 3a8bc7917..e400c0ce9 100644 --- a/cluster/examples/kubernetes/ceph/cluster-stretched.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-stretched.yaml @@ -68,3 +68,5 @@ spec: values: - b - c + disruptionManagement: + managePodBudgets: true diff --git a/cluster/examples/kubernetes/ceph/cluster-test.yaml b/cluster/examples/kubernetes/ceph/cluster-test.yaml index 3cef25ee4..53f50d75b 100644 --- a/cluster/examples/kubernetes/ceph/cluster-test.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-test.yaml @@ -44,3 +44,5 @@ spec: mon: interval: 45s timeout: 600s + disruptionManagement: + managePodBudgets: true diff --git a/cluster/examples/kubernetes/ceph/cluster-with-drive-groups.yaml b/cluster/examples/kubernetes/ceph/cluster-with-drive-groups.yaml index 15b208375..5eec12011 100644 --- a/cluster/examples/kubernetes/ceph/cluster-with-drive-groups.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-with-drive-groups.yaml @@ -99,3 +99,5 @@ spec: # tolerations: # - key: storage-node # operator: Exists + disruptionManagement: + managePodBudgets: true diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 77b9e23ff..a30b1ecc5 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -221,7 +221,7 @@ spec: # If true, the operator will create and manage PodDisruptionBudgets for OSD, Mon, RGW, and MDS daemons. OSD PDBs are managed dynamically # via the strategy outlined in the [design](https://github.com/rook/rook/blob/master/design/ceph/ceph-managed-disruptionbudgets.md). The operator will # block eviction of OSDs by default and unblock them safely when drains are detected. - managePodBudgets: false + managePodBudgets: true # A duration in minutes that determines how long an entire failureDomain like `region/zone/host` will be held in `noout` (in addition to the # default DOWN/OUT interval) when it is draining. This is only relevant when `managePodBudgets` is `true`. The default value is `30` minutes. osdMaintenanceTimeout: 30 diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index c0ab5fc78..54fb0a6fe 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -3472,7 +3472,7 @@ spec: accessModes: - ReadWriteOnce disruptionManagement: - managePodBudgets: false + managePodBudgets: true osdMaintenanceTimeout: 30 pgHealthCheckTimeout: 0 manageMachineDisruptionBudgets: false