Merge pull request #3904 from sebastian-philipp/crd-validation-disruptionManagement

Fix CRD Validation: disruptionManagement and mgr modules
This commit is contained in:
Travis Nielsen authored and GitHub committed 2019-09-20 17:06:45 -06:00
commit f96960cfcc
5 files changed
+83 -5

No files matched your search

@@ -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:
@@ -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
@@ -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:
@@ -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:
+19 -3
View File
@@ -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