From f66f6c1ce31133fd1f3b1956a4b01de80e7aa25f Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 18 Sep 2019 12:34:10 +0200 Subject: [PATCH 1/3] disruptionManagement: Added missing CRD validation Also: * `cluster.yaml`: spec.mgr.modules is not explicily nullable * Removed `required: mon` in `ceph_manifests.go` Signed-off-by: Sebastian Wagner --- .../charts/rook-ceph/templates/resources.yaml | 20 +++++++++++++++++++ cluster/examples/kubernetes/ceph/cluster.yaml | 2 +- cluster/examples/kubernetes/ceph/common.yaml | 12 +++++++++++ .../ceph/upgrade-from-v1.0-crds.yaml | 12 +++++++++++ tests/framework/installer/ceph_manifests.go | 16 ++++++++++++--- 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 9a57381e8..7a8427616 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: @@ -64,6 +74,16 @@ spec: type: boolean storage: properties: + disruptionManagement: + properties: + machineDisruptionBudgetNamespace: + type: string + managePodBudgets: + type: boolean + osdMaintenanceTimeout: + type: integer + manageMachineDisruptionBudgets: + type: boolean useAllNodes: type: boolean nodes: diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 67cacf998..d82e2cb34 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -39,7 +39,7 @@ spec: count: 3 allowMultiplePerNode: false mgr: - modules: + 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..67ca056bc 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: @@ -85,6 +95,8 @@ spec: properties: disruptionManagement: properties: + machineDisruptionBudgetNamespace: + type: string managePodBudgets: type: boolean osdMaintenanceTimeout: 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..73847c8f0 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: @@ -68,6 +78,8 @@ spec: properties: disruptionManagement: properties: + machineDisruptionBudgetNamespace: + type: string managePodBudgets: type: boolean osdMaintenanceTimeout: diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 3927c1726..2408339b1 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -112,13 +112,23 @@ 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 mgr: properties: @@ -137,6 +147,8 @@ spec: properties: disruptionManagement: properties: + machineDisruptionBudgetNamespace: + type: string managePodBudgets: type: boolean osdMaintenanceTimeout: @@ -212,8 +224,6 @@ spec: type: integer placement: {} resources: {} - required: - - mon additionalPrinterColumns: - name: DataDirHostPath type: string From 1987480dc5f8125f6f1fcb5cf51f59b417fc12ee Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 18 Sep 2019 14:37:08 +0200 Subject: [PATCH 2/3] Added missing properties * volumeClaimTemplate * storageClassDeviceSets * external.enable Signed-off-by: Sebastian Wagner --- cluster/charts/rook-ceph/templates/resources.yaml | 6 ++++++ cluster/examples/kubernetes/ceph/common.yaml | 6 ++++++ .../examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml | 6 ++++++ tests/framework/installer/ceph_manifests.go | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 7a8427616..07806a63a 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -59,6 +59,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -141,6 +142,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -151,6 +153,10 @@ spec: properties: workers: type: integer + external: + properties: + enable: + type: boolean placement: {} resources: {} additionalPrinterColumns: diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 67ca056bc..3386b9735 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -78,6 +78,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -160,6 +161,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -170,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 73847c8f0..765d3e884 100644 --- a/cluster/examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml +++ b/cluster/examples/kubernetes/ceph/upgrade-from-v1.0-crds.yaml @@ -61,6 +61,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -143,6 +144,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -153,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 2408339b1..8430d0cbd 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -130,6 +130,7 @@ spec: maximum: 9 minimum: 0 type: integer + volumeClaimTemplate: {} mgr: properties: modules: @@ -212,6 +213,7 @@ spec: config: {} topologyAware: type: boolean + storageClassDeviceSets: {} monitoring: properties: enabled: @@ -222,6 +224,10 @@ spec: properties: workers: type: integer + external: + properties: + enable: + type: boolean placement: {} resources: {} additionalPrinterColumns: From ec77c21f9bd5fc1f91878786991245552e5363f3 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 19 Sep 2019 10:05:56 +0200 Subject: [PATCH 3/3] examples/ceph/cluster.yaml: comment out `mgr.modules` Signed-off-by: Sebastian Wagner --- cluster/examples/kubernetes/ceph/cluster.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index d82e2cb34..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