Commit 5bdda63
committed
wip: fix CI failures on Kubernetes 1.35
wait-ceph-ready: also check that at least one OSD is up before
proceeding; with Rook v1.19.5, ceph -s succeeds before OSDs are
ready, causing PVC provisioning to fail.
reconcileAsStandalone/reconcileAsPrimary: add IsSnapshotCaptured()
guard before calling verify(); without it, a controller watching a
backup from a different Ceph cluster (clusterID mismatch) would
attempt to verify with an empty PVCManifest and error.
https://github.com/cybozu-go/mantle/actions/runs/25890739907/job/76093083397?pr=279
Signed-off-by: Kohya Shiozaki <kouyan120706@gmail.com>1 parent b470f22 commit 5bdda63
2 files changed
Lines changed: 4 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
447 | 447 | | |
448 | 448 | | |
449 | 449 | | |
450 | | - | |
| 450 | + | |
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
| |||
464 | 464 | | |
465 | 465 | | |
466 | 466 | | |
467 | | - | |
| 467 | + | |
468 | 468 | | |
469 | 469 | | |
470 | 470 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | | - | |
| 219 | + | |
| 220 | + | |
220 | 221 | | |
221 | 222 | | |
222 | 223 | | |
| |||
0 commit comments