Repository navigation
Commit cd66a2b
committed
fix(vm-disk): fail on storageClass/source edit of existing disk
Editing a VMDisk's storageClass or source after its DataVolume already
exists was silently ignored: dv.yaml reused the existing DataVolume.spec
verbatim (DataVolume.spec is immutable in CDI), so the edit rendered as a
no-op while the HelmRelease reported success and the CR diverged from the
cluster.
When a DataVolume already exists, fail with a clear message if the
requested storageClass or source differs from what the disk was created
with. Both compare the operator's input recorded in an annotation at
creation (vm-disk.cozystack.io/storage-class and .../source), written only
at creation and preserved verbatim afterwards — never overwritten with an
unapplied edit. Comparing recorded input rather than the rendered spec
matters because the image-clone PVC name carries a chart-version prefix
(vm-image- was renamed to vm-default-images-, commit bec35e3) that drifts
across upgrades without any edit, and because clearing storageClass to ""
(cluster default) must still be caught. A disk that predates the annotation
falls back: storageClass to the bound PVC's class (then the DV spec),
compared only when the request is non-empty so a default-class disk is not
misread as a change; source to the stored spec.source for every type except
image, whose prefix drift makes it the one documented exemption. An
unrecognized source type now fails explicitly instead of rendering an empty
source. Storage growth is unaffected and still handled by pvc-resize-hook.yaml.
Mark source as immutable in values.yaml so the generated schema carries
the same x-kubernetes-validations rule already present on storageClass,
and document the vm-disk source contract in docs/storage-immutability.md
and the chart README. Aggregated-apiserver CEL enforcement is tracked
separately in #2657; the chart-level fail is the substantive guard today.
Add helm-unittest coverage for the immutability guard (rejection incl.
clearing storageClass to empty, no-op reuse with annotations preserved,
legacy image-disk drift, legacy non-image fallback, annotation
non-poisoning, PVC-backed and default-class storageClass on adopted disks,
unknown source) and initial-creation source rendering.
Fixes #2985
Signed-off-by: Alexey Artamonov <[email protected]>1 parent eef95f4 commit cd66a2b
9 files changed
Lines changed: 626 additions & 26 deletions
File tree
- api/apps/v1alpha1/vmdisk
- docs
- packages
- apps/vm-disk
- templates
- tests
- system/vm-disk-rd/cozyrds
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
25 | 31 | | |
26 | 32 | | |
27 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
2 | 85 | | |
3 | 86 | | |
4 | 87 | | |
5 | 88 | | |
6 | 89 | | |
7 | 90 | | |
8 | 91 | | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
9 | 105 | | |
10 | 106 | | |
11 | 107 | | |
12 | 108 | | |
13 | 109 | | |
14 | 110 | | |
15 | 111 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | 112 | | |
| 113 | + | |
38 | 114 | | |
39 | | - | |
40 | | - | |
| 115 | + | |
41 | 116 | | |
42 | 117 | | |
43 | 118 | | |
| |||
0 commit comments