Skip to content

Commit 32b8d83

Browse files
committed
rook-ceph-cluster: drop allowUnsupported from desired via comparePatch remove
Quoted string value still drifted (string "false" != live). comparePatches apply to the desired manifest, so removing allowUnsupported there matches the live CR (which omitempty-strips it), clearing the cephcluster Modified status.
1 parent 78a4962 commit 32b8d83

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

‎rook-ceph-cluster/fleet.yaml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@ diff:
3131
operations:
3232
- {op: remove, path: /spec/cleanupPolicy}
3333
- {op: remove, path: /spec/healthCheck}
34-
# allowUnsupported is the ODD ONE OUT: every other op removes an
35-
# operator-ADDED default from live, but the chart RENDERS
36-
# allowUnsupported:false while Rook omitempty-strips it from the live CR
37-
# (live .spec.cephVersion = {image} only). A `remove` of a key absent
38-
# from live errors ("Unable to remove nonexistent key") and voids the
39-
# ENTIRE patch (all 14 ops), so the whole CephCluster shows as drift.
40-
# Use `add` instead: inject allowUnsupported:false into live during
41-
# normalization so it matches the rendered manifest. `add` never fails.
42-
- {op: add, path: /spec/cephVersion/allowUnsupported, value: "false"}
34+
# allowUnsupported: the chart RENDERS allowUnsupported:false while Rook
35+
# omitempty-strips it from the live CR (live .spec.cephVersion = {image}
36+
# only). comparePatches apply to the DESIRED manifest, so remove it there
37+
# to match live. (An earlier `add value: false` used a bare bool, which
38+
# Fleet — whose operations[].value is string-typed — fataled on, stalling
39+
# the whole gitjob; quoting it injected the string "false" and still drifted.)
40+
- {op: remove, path: /spec/cephVersion/allowUnsupported}
4341
- {op: remove, path: /spec/crashCollector/disable}
4442
- {op: remove, path: /spec/dashboard/ssl}
4543
- {op: remove, path: /spec/mgr/allowMultiplePerNode}

0 commit comments

Comments
 (0)