From 3ff0ed736436e1c074d16bd07a9ae427991c5186 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 31 Mar 2026 10:58:20 +0300 Subject: [PATCH 1/3] fix(observability): fix gaps in live migration metrics Signed-off-by: Maksim Fedotov --- build/components/versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/components/versions.yml b/build/components/versions.yml index 438feffc2b..e747101b8a 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -3,7 +3,7 @@ firmware: libvirt: v10.9.0 edk2: stable202411 core: - 3p-kubevirt: v1.6.2-v12n.20 + 3p-kubevirt: fix/fix-live-migration-metrics-gaps 3p-containerized-data-importer: v1.60.3-v12n.17 distribution: 2.8.3 package: From baff1f4a4236d1ba580d0e784872751deb57c8ff Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Thu, 2 Apr 2026 15:58:02 +0300 Subject: [PATCH 2/3] cherry-pick pr16572 Signed-off-by: Maksim Fedotov --- images/virt-artifact/werf.inc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index f30560fba6..5122e1303e 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -12,6 +12,7 @@ fromImage: builder/src secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO }} +fromCacheVersion: new shell: install: - | From 8e366140a74aa5a135d757f21c270b52757ec215 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Fri, 3 Apr 2026 15:40:18 +0300 Subject: [PATCH 3/3] set version Signed-off-by: Maksim Fedotov --- build/components/versions.yml | 2 +- images/virt-artifact/werf.inc.yaml | 1 - images/virtualization-artifact/go.mod | 2 +- images/virtualization-artifact/go.sum | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/components/versions.yml b/build/components/versions.yml index e747101b8a..f72a94e45d 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -3,7 +3,7 @@ firmware: libvirt: v10.9.0 edk2: stable202411 core: - 3p-kubevirt: fix/fix-live-migration-metrics-gaps + 3p-kubevirt: v1.6.2-v12n.21 3p-containerized-data-importer: v1.60.3-v12n.17 distribution: 2.8.3 package: diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 5122e1303e..f30560fba6 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -12,7 +12,6 @@ fromImage: builder/src secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO }} -fromCacheVersion: new shell: install: - | diff --git a/images/virtualization-artifact/go.mod b/images/virtualization-artifact/go.mod index 26a33a76ac..bade8ad4ec 100644 --- a/images/virtualization-artifact/go.mod +++ b/images/virtualization-artifact/go.mod @@ -168,4 +168,4 @@ replace ( ) // Kubevirt API replaces -replace kubevirt.io/api => github.com/deckhouse/3p-kubevirt/staging/src/kubevirt.io/api v1.6.2-v12n.16 +replace kubevirt.io/api => github.com/deckhouse/3p-kubevirt/staging/src/kubevirt.io/api v1.6.2-v12n.21 diff --git a/images/virtualization-artifact/go.sum b/images/virtualization-artifact/go.sum index 988655c2e6..0ec653e4a0 100644 --- a/images/virtualization-artifact/go.sum +++ b/images/virtualization-artifact/go.sum @@ -49,8 +49,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/3p-kubevirt/staging/src/kubevirt.io/api v1.6.2-v12n.16 h1:HzyValkO6ODGNvGtHhu11R7QkXzNkk4vmPgFouLE3NM= -github.com/deckhouse/3p-kubevirt/staging/src/kubevirt.io/api v1.6.2-v12n.16/go.mod h1:J2HiSOLVhKj2UXoe14V6rpr3ZO/W/QBxcN+QK/S0Xkc= +github.com/deckhouse/3p-kubevirt/staging/src/kubevirt.io/api v1.6.2-v12n.21 h1:W0nSf7fOTTLn5lVqR4JR3KctrABzyqb/sCkmSPx2fEY= +github.com/deckhouse/3p-kubevirt/staging/src/kubevirt.io/api v1.6.2-v12n.21/go.mod h1:wGZLfRa/b4w/V/hakmfcK0CmrAZGfpj+jN7BMt0s19E= github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250226105106-176cd3afcdd5 h1:PsN1E0oxC/+4zdA977txrqUCuObFL3HAuu5Xnud8m8c= github.com/deckhouse/deckhouse/pkg/log v0.0.0-20250226105106-176cd3afcdd5/go.mod h1:Mk5HRzkc5pIcDIZ2JJ6DPuuqnwhXVkb3you8M8Mg+4w= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=