Skip to content

Commit 59e09de

Browse files
rouke-broersmarouke-broersma
authored
feat: Update ceph.rook.io to 1.18.2 (datreeio#661)
1 parent eb53ba0 commit 59e09de

13 files changed

+1003
-22
lines changed

‎ceph.rook.io/cephblockpool_v1.json‎

Lines changed: 112 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@
5353
"description": "The erasure code settings",
5454
"properties": {
5555
"algorithm": {
56-
"description": "The algorithm for erasure coding",
56+
"description": "The algorithm for erasure coding.\nIf absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.",
57+
"enum": [
58+
"isa",
59+
"jerasure"
60+
],
5761
"type": "string"
5862
},
5963
"codingChunks": {
@@ -86,7 +90,12 @@
8690
"type": "boolean"
8791
},
8892
"mode": {
89-
"description": "Mode is the mirroring mode: either pool or image",
93+
"description": "Mode is the mirroring mode: pool, image or init-only.",
94+
"enum": [
95+
"pool",
96+
"image",
97+
"init-only"
98+
],
9099
"type": "string"
91100
},
92101
"peers": {
@@ -217,6 +226,7 @@
217226
},
218227
"targetSizeRatio": {
219228
"description": "TargetSizeRatio gives a hint (%) to Ceph in terms of expected consumption of the total cluster capacity",
229+
"minimum": 0,
220230
"type": "number"
221231
}
222232
},
@@ -259,6 +269,29 @@
259269
"status": {
260270
"description": "CephBlockPoolStatus represents the mirroring status of Ceph Storage Pool",
261271
"properties": {
272+
"cephx": {
273+
"description": "PeerTokenCephxStatus represents the cephx key rotation status for peer tokens",
274+
"properties": {
275+
"peerToken": {
276+
"description": "PeerToken shows the rotation status of the peer token associated with the `rbd-mirror-peer` user.",
277+
"properties": {
278+
"keyCephVersion": {
279+
"description": "KeyCephVersion reports the Ceph version that created the current generation's keys. This is\nsame string format as reported by `CephCluster.status.version.version` to allow them to be\ncompared. E.g., `20.2.0-0`.\nFor all newly-created resources, this field set to the version of Ceph that created the key.\nThe special value \"Uninitialized\" indicates that keys are being created for the first time.\nAn empty string indicates that the version is unknown, as expected in brownfield deployments.",
280+
"type": "string"
281+
},
282+
"keyGeneration": {
283+
"description": "KeyGeneration represents the CephX key generation for the last successful reconcile.\nFor all newly-created resources, this field is set to `1`.\nWhen keys are rotated due to any rotation policy, the generation is incremented or updated to\nthe configured policy generation.\nGeneration `0` indicates that keys existed prior to the implementation of key tracking.",
284+
"format": "int32",
285+
"type": "integer"
286+
}
287+
},
288+
"type": "object",
289+
"additionalProperties": false
290+
}
291+
},
292+
"type": "object",
293+
"additionalProperties": false
294+
},
262295
"conditions": {
263296
"items": {
264297
"description": "Condition represents a status condition on any Rook-Ceph Custom Resource.",
@@ -375,6 +408,47 @@
375408
"description": "DaemonHealth is the health of the mirroring daemon",
376409
"type": "string"
377410
},
411+
"group_health": {
412+
"description": "GroupHealth is the health of the mirrored image group",
413+
"nullable": true,
414+
"type": "string"
415+
},
416+
"group_states": {
417+
"description": "GroupStates is the various state for all mirrored image groups",
418+
"nullable": true,
419+
"properties": {
420+
"error": {
421+
"description": "Error is when the mirroring state is errored",
422+
"type": "integer"
423+
},
424+
"replaying": {
425+
"description": "Replaying is when the replay of the mirroring journal is on-going",
426+
"type": "integer"
427+
},
428+
"starting_replay": {
429+
"description": "StartingReplay is when the replay of the mirroring journal starts",
430+
"type": "integer"
431+
},
432+
"stopped": {
433+
"description": "Stopped is when the mirroring state is stopped",
434+
"type": "integer"
435+
},
436+
"stopping_replay": {
437+
"description": "StopReplaying is when the replay of the mirroring journal stops",
438+
"type": "integer"
439+
},
440+
"syncing": {
441+
"description": "Syncing is when the image is syncing",
442+
"type": "integer"
443+
},
444+
"unknown": {
445+
"description": "Unknown is when the mirroring state is unknown",
446+
"type": "integer"
447+
}
448+
},
449+
"type": "object",
450+
"additionalProperties": false
451+
},
378452
"health": {
379453
"description": "Health is the mirroring health",
380454
"type": "string"
@@ -383,6 +457,42 @@
383457
"description": "ImageHealth is the health of the mirrored image",
384458
"type": "string"
385459
},
460+
"image_states": {
461+
"description": "ImageStates is the various state for all mirrored images",
462+
"nullable": true,
463+
"properties": {
464+
"error": {
465+
"description": "Error is when the mirroring state is errored",
466+
"type": "integer"
467+
},
468+
"replaying": {
469+
"description": "Replaying is when the replay of the mirroring journal is on-going",
470+
"type": "integer"
471+
},
472+
"starting_replay": {
473+
"description": "StartingReplay is when the replay of the mirroring journal starts",
474+
"type": "integer"
475+
},
476+
"stopped": {
477+
"description": "Stopped is when the mirroring state is stopped",
478+
"type": "integer"
479+
},
480+
"stopping_replay": {
481+
"description": "StopReplaying is when the replay of the mirroring journal stops",
482+
"type": "integer"
483+
},
484+
"syncing": {
485+
"description": "Syncing is when the image is syncing",
486+
"type": "integer"
487+
},
488+
"unknown": {
489+
"description": "Unknown is when the mirroring state is unknown",
490+
"type": "integer"
491+
}
492+
},
493+
"type": "object",
494+
"additionalProperties": false
495+
},
386496
"states": {
387497
"description": "States is the various state for all mirrored images",
388498
"nullable": true,

‎ceph.rook.io/cephblockpoolradosnamespace_v1.json‎

Lines changed: 123 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,24 @@
2525
}
2626
]
2727
},
28+
"clusterID": {
29+
"description": "ClusterID to be used for this RadosNamespace in the CSI configuration.\nIt must be unique among all Ceph clusters managed by Rook.\nIf not specified, the clusterID will be generated and can be found in the CR status.",
30+
"maxLength": 36,
31+
"minLength": 1,
32+
"pattern": "^[a-zA-Z0-9_-]+$",
33+
"type": "string",
34+
"x-kubernetes-validations": [
35+
{
36+
"message": "ClusterID is immutable",
37+
"rule": "self == oldSelf"
38+
}
39+
]
40+
},
2841
"mirroring": {
2942
"description": "Mirroring configuration of CephBlockPoolRadosNamespace",
3043
"properties": {
3144
"mode": {
32-
"description": "Mode is the mirroring mode; either pool or image",
45+
"description": "Mode is the mirroring mode; either pool or image.",
3346
"enum": [
3447
"",
3548
"pool",
@@ -91,6 +104,38 @@
91104
"status": {
92105
"description": "Status represents the status of a CephBlockPool Rados Namespace",
93106
"properties": {
107+
"conditions": {
108+
"items": {
109+
"description": "Condition represents a status condition on any Rook-Ceph Custom Resource.",
110+
"properties": {
111+
"lastHeartbeatTime": {
112+
"format": "date-time",
113+
"type": "string"
114+
},
115+
"lastTransitionTime": {
116+
"format": "date-time",
117+
"type": "string"
118+
},
119+
"message": {
120+
"type": "string"
121+
},
122+
"reason": {
123+
"description": "ConditionReason is a reason for a condition",
124+
"type": "string"
125+
},
126+
"status": {
127+
"type": "string"
128+
},
129+
"type": {
130+
"description": "ConditionType represent a resource's status",
131+
"type": "string"
132+
}
133+
},
134+
"type": "object",
135+
"additionalProperties": false
136+
},
137+
"type": "array"
138+
},
94139
"info": {
95140
"additionalProperties": {
96141
"type": "string"
@@ -175,6 +220,47 @@
175220
"description": "DaemonHealth is the health of the mirroring daemon",
176221
"type": "string"
177222
},
223+
"group_health": {
224+
"description": "GroupHealth is the health of the mirrored image group",
225+
"nullable": true,
226+
"type": "string"
227+
},
228+
"group_states": {
229+
"description": "GroupStates is the various state for all mirrored image groups",
230+
"nullable": true,
231+
"properties": {
232+
"error": {
233+
"description": "Error is when the mirroring state is errored",
234+
"type": "integer"
235+
},
236+
"replaying": {
237+
"description": "Replaying is when the replay of the mirroring journal is on-going",
238+
"type": "integer"
239+
},
240+
"starting_replay": {
241+
"description": "StartingReplay is when the replay of the mirroring journal starts",
242+
"type": "integer"
243+
},
244+
"stopped": {
245+
"description": "Stopped is when the mirroring state is stopped",
246+
"type": "integer"
247+
},
248+
"stopping_replay": {
249+
"description": "StopReplaying is when the replay of the mirroring journal stops",
250+
"type": "integer"
251+
},
252+
"syncing": {
253+
"description": "Syncing is when the image is syncing",
254+
"type": "integer"
255+
},
256+
"unknown": {
257+
"description": "Unknown is when the mirroring state is unknown",
258+
"type": "integer"
259+
}
260+
},
261+
"type": "object",
262+
"additionalProperties": false
263+
},
178264
"health": {
179265
"description": "Health is the mirroring health",
180266
"type": "string"
@@ -183,6 +269,42 @@
183269
"description": "ImageHealth is the health of the mirrored image",
184270
"type": "string"
185271
},
272+
"image_states": {
273+
"description": "ImageStates is the various state for all mirrored images",
274+
"nullable": true,
275+
"properties": {
276+
"error": {
277+
"description": "Error is when the mirroring state is errored",
278+
"type": "integer"
279+
},
280+
"replaying": {
281+
"description": "Replaying is when the replay of the mirroring journal is on-going",
282+
"type": "integer"
283+
},
284+
"starting_replay": {
285+
"description": "StartingReplay is when the replay of the mirroring journal starts",
286+
"type": "integer"
287+
},
288+
"stopped": {
289+
"description": "Stopped is when the mirroring state is stopped",
290+
"type": "integer"
291+
},
292+
"stopping_replay": {
293+
"description": "StopReplaying is when the replay of the mirroring journal stops",
294+
"type": "integer"
295+
},
296+
"syncing": {
297+
"description": "Syncing is when the image is syncing",
298+
"type": "integer"
299+
},
300+
"unknown": {
301+
"description": "Unknown is when the mirroring state is unknown",
302+
"type": "integer"
303+
}
304+
},
305+
"type": "object",
306+
"additionalProperties": false
307+
},
186308
"states": {
187309
"description": "States is the various state for all mirrored images",
188310
"nullable": true,

0 commit comments

Comments
 (0)