diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 9a57381e8..07806a63a 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -39,6 +39,16 @@ spec: dataDirHostPath: pattern: ^/(\S+) type: string + disruptionManagement: + properties: + machineDisruptionBudgetNamespace: + type: string + managePodBudgets: + type: boolean + osdMaintenanceTimeout: + type: integer + manageMachineDisruptionBudgets: + type: boolean skipUpgradeChecks: type: boolean mon: @@ -49,6 +59,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -64,6 +75,16 @@ spec: type: boolean storage: properties: + disruptionManagement: + properties: + machineDisruptionBudgetNamespace: + type: string + managePodBudgets: + type: boolean + osdMaintenanceTimeout: + type: integer + manageMachineDisruptionBudgets: + type: boolean useAllNodes: type: boolean nodes: @@ -121,6 +142,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -131,6 +153,10 @@ spec: properties: workers: type: integer + external: + properties: + enable: + type: boolean placement: {} resources: {} additionalPrinterColumns: diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 67cacf998..f26c6e7fb 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -38,8 +38,8 @@ spec: mon: count: 3 allowMultiplePerNode: false - mgr: - modules: + # mgr: + # modules: # Several modules should not need to be included in this list. The "dashboard" and "monitoring" modules # are already enabled by other settings in the cluster CR and the "rook" module is always enabled. # - name: pg_autoscaler diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 04bc4cc4d..3386b9735 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -58,6 +58,16 @@ spec: dataDirHostPath: pattern: ^/(\S+) type: string + disruptionManagement: + properties: + machineDisruptionBudgetNamespace: + type: string + managePodBudgets: + type: boolean + osdMaintenanceTimeout: + type: integer + manageMachineDisruptionBudgets: + type: boolean skipUpgradeChecks: type: boolean mon: @@ -68,6 +78,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -85,6 +96,8 @@ spec: properties: disruptionManagement: properties: + machineDisruptionBudgetNamespace: + type: string managePodBudgets: type: boolean osdMaintenanceTimeout: @@ -148,6 +161,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -158,6 +172,10 @@ spec: properties: workers: type: integer + external: + properties: + enable: + type: boolean placement: {} resources: {} additionalPrinterColumns: diff --git a/cluster/examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml b/cluster/examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml index f0cbe695a..765d3e884 100644 --- a/cluster/examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml +++ b/cluster/examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml @@ -41,6 +41,16 @@ spec: dataDirHostPath: pattern: ^/(\S+) type: string + disruptionManagement: + properties: + machineDisruptionBudgetNamespace: + type: string + managePodBudgets: + type: boolean + osdMaintenanceTimeout: + type: integer + manageMachineDisruptionBudgets: + type: boolean skipUpgradeChecks: type: boolean mon: @@ -51,6 +61,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -68,6 +79,8 @@ spec: properties: disruptionManagement: properties: + machineDisruptionBudgetNamespace: + type: string managePodBudgets: type: boolean osdMaintenanceTimeout: @@ -131,6 +144,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -141,6 +155,10 @@ spec: properties: workers: type: integer + external: + properties: + enable: + type: boolean placement: {} resources: {} additionalPrinterColumns: diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 3927c1726..8430d0cbd 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -112,14 +112,25 @@ spec: dataDirHostPath: pattern: ^/(\S+) type: string + disruptionManagement: + properties: + machineDisruptionBudgetNamespace: + type: string + managePodBudgets: + type: boolean + osdMaintenanceTimeout: + type: integer + manageMachineDisruptionBudgets: + type: boolean mon: properties: allowMultiplePerNode: type: boolean count: maximum: 9 - minimum: 1 + minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -137,6 +148,8 @@ spec: properties: disruptionManagement: properties: + machineDisruptionBudgetNamespace: + type: string managePodBudgets: type: boolean osdMaintenanceTimeout: @@ -200,6 +213,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -210,10 +224,12 @@ spec: properties: workers: type: integer + external: + properties: + enable: + type: boolean placement: {} resources: {} - required: - - mon additionalPrinterColumns: - name: DataDirHostPath type: string