Skip to content

Commit 44b95e7

Browse files
committed
fix(cdi): update CDI to v1.66.1
Brings two upstream fixes CDI v1.64.0 users hit in the field: - qemu-img 10.1.0-24.el9 restores HTTP imports to block volumes on 4Kn devices (DRBD/LINSTOR), the regression that kept this repo from following v1.65.0. The earlier -21 build shipped in v1.66.0 did not carry the fix, which is why this targets v1.66.1. - import-controller no longer clears event-based bound-condition annotations on every pod sync, removing the resourceVersion storm on prime PVCs during WFFC imports that starved the scheduler with FailedScheduling retries. The fix is commit e547586e9, a one-line guard in updatePvcFromPod that rides inside a squash titled after its kubevirtci changes, so neither the release notes nor the pull request title mention it. The operator manifest is refetched with make update. Two local customizations survive as patches now: the startupProbe patch gains the correct -p4 strip level (it never applied from the package directory as written), and the control-plane tolerations that were hand-edited into the manifest since v0.0.1 move into patches/tolerations.diff so the next refetch cannot drop them. Behavioral notes for this bump: CDI /metrics now requires a bearer token (nothing in this repo scrapes it); scratch PVCs inherit the target StorageClass instead of the cluster default; the PVC-rendering webhook is always registered but only matches PVCs labeled cdi.kubevirt.io/applyStorageProfile=true, which nothing here sets. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent dc2e427 commit 44b95e7

3 files changed

Lines changed: 112 additions & 96 deletions

File tree

‎packages/system/kubevirt-cdi-operator/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ update:
1010
wget https://github.com/kubevirt/containerized-data-importer/releases/download/$$VERSION/cdi-operator.yaml -O templates/cdi-operator.yaml
1111
sed -i 's/namespace: cdi/namespace: cozy-kubevirt-cdi/g' templates/cdi-operator.yaml
1212
awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/cdi-operator.yaml
13-
patch --no-backup-if-mismatch -p1 < patches/startupProbe.diff
13+
patch --no-backup-if-mismatch -p4 < patches/startupProbe.diff
14+
patch --no-backup-if-mismatch -p4 < patches/tolerations.diff
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--- a/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
2+
+++ b/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
3+
@@ -5807,4 +5807,13 @@
4+
securityContext:
5+
runAsNonRoot: true
6+
serviceAccountName: cdi-operator
7+
+ tolerations:
8+
+ - key: CriticalAddonsOnly
9+
+ operator: Exists
10+
+ - effect: NoSchedule
11+
+ key: node-role.kubernetes.io/control-plane
12+
+ operator: Exists
13+
+ - effect: NoSchedule
14+
+ key: node-role.kubernetes.io/master
15+
+ operator: Exists
16+
---
17+
\ No newline at end of file

0 commit comments

Comments
 (0)