From 14f2aff4f10140b1581187b9232d1869985dacbe Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 8 Oct 2025 10:17:04 +0300 Subject: [PATCH 01/10] unplug Signed-off-by: Valeriy Khorunzhin --- .../pkg/controller/vmchange/comparators.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/images/virtualization-artifact/pkg/controller/vmchange/comparators.go b/images/virtualization-artifact/pkg/controller/vmchange/comparators.go index 8c44383fe9..828549ad8c 100644 --- a/images/virtualization-artifact/pkg/controller/vmchange/comparators.go +++ b/images/virtualization-artifact/pkg/controller/vmchange/comparators.go @@ -159,6 +159,19 @@ func compareMemory(current, desired *v1alpha2.VirtualMachineSpec) []FieldChange } func compareProvisioning(current, desired *v1alpha2.VirtualMachineSpec) []FieldChange { + // Special case: if we're removing provisioning (desired is nil), don't require restart + if current.Provisioning != nil && desired.Provisioning == nil { + return []FieldChange{ + { + Operation: ChangeRemove, + Path: "provisioning", + CurrentValue: current.Provisioning, + DesiredValue: nil, + ActionRequired: ActionApplyImmediate, + }, + } + } + changes := compareEmpty( "provisioning", NewPtrValue(current.Provisioning, current.Provisioning == nil), From 07a9a59df95a4e233705004737bfb0e7d004e4c8 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 8 Oct 2025 10:21:54 +0300 Subject: [PATCH 02/10] add kv patch Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/werf.inc.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index f76dcf3163..343b3ec136 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -1,7 +1,7 @@ --- # Source https://github.com/kubevirt/kubevirt/blob/v1.3.1/hack/dockerized#L15 {{- $gitRepoName := "3p-kubevirt" }} -{{- $tag := get $.Core $gitRepoName }} +{{- $tag := print "v1.3.1-virtualization-hot-unplug-cloud-init" }} {{- $version := (split "-" $tag)._0 }} --- @@ -66,9 +66,10 @@ shell: {{ $builderDependencies.altPackages | join " " }} {{- include "alt packages clean" . | nindent 2 }} - + installCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" # <--- для пересборки install: - | + echo "$date" # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do From 32516d9248d681d5a7e7d2eeb9649a0f61e92220 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Wed, 8 Oct 2025 10:41:34 +0300 Subject: [PATCH 03/10] fix test Signed-off-by: Valeriy Khorunzhin --- .../pkg/controller/vmchange/compare_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/virtualization-artifact/pkg/controller/vmchange/compare_test.go b/images/virtualization-artifact/pkg/controller/vmchange/compare_test.go index 7d3951b293..4a95c3b3af 100644 --- a/images/virtualization-artifact/pkg/controller/vmchange/compare_test.go +++ b/images/virtualization-artifact/pkg/controller/vmchange/compare_test.go @@ -267,7 +267,7 @@ provisioning: ), }, { - "restart on provisioning remove", + "apply immediate on provisioning remove", ` provisioning: type: UserDataRef @@ -277,7 +277,7 @@ provisioning: `, "", assertChanges( - actionRequired(ActionRestart), + actionRequired(ActionApplyImmediate), requirePathOperation("provisioning", ChangeRemove), ), }, From 5609306842d03ad3f7d2cfbd3bd3bce5eb5f2846 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 12:48:58 +0300 Subject: [PATCH 04/10] 1 Signed-off-by: Valeriy Khorunzhin --- 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 343b3ec136..9c87383413 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -70,6 +70,7 @@ shell: install: - | echo "$date" + echo kek # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do From 213091ab00ab45f3482c225f8c987cf2faa74b20 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 13:10:00 +0300 Subject: [PATCH 05/10] ttt Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 9c87383413..3d967f6950 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -13,7 +13,7 @@ secrets: value: {{ $.SOURCE_REPO }} shell: install: - - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/deckhouse/3p-kubevirt --branch {{ $tag }} /kubevirt + - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt --- From 3ffb68f60c0bd537ef5291dbbeed819375188566 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 14:17:11 +0300 Subject: [PATCH 06/10] ttt Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 3d967f6950..8f53628319 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -13,7 +13,7 @@ secrets: value: {{ $.SOURCE_REPO }} shell: install: - - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt + - git clone --depth=1 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt --- From 8c2256a3f0d3686f61f6d59b7002c0d9a9e35d85 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 14:21:08 +0300 Subject: [PATCH 07/10] f Signed-off-by: Valeriy Khorunzhin --- 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 8f53628319..52826f26b4 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -13,6 +13,7 @@ secrets: value: {{ $.SOURCE_REPO }} shell: install: + - echo kek - git clone --depth=1 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt --- From 24932834ebb9d7b9cc0d44673644ed9b72cc953c Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 14:24:11 +0300 Subject: [PATCH 08/10] ff Signed-off-by: Valeriy Khorunzhin --- 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 52826f26b4..9f9db468e2 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -12,6 +12,7 @@ secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO }} shell: + installCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" # <--- для пересборки install: - echo kek - git clone --depth=1 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt From 58894acd8528b2cf263715c29883ba1a46dbc105 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 14:27:19 +0300 Subject: [PATCH 09/10] ffff Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/werf.inc.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index 9f9db468e2..c93b6a886a 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -12,9 +12,7 @@ secrets: - id: SOURCE_REPO value: {{ $.SOURCE_REPO }} shell: - installCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" # <--- для пересборки install: - - echo kek - git clone --depth=1 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt --- @@ -73,6 +71,9 @@ shell: - | echo "$date" echo kek + + git clone --depth=1 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt + # Install packages PKGS="{{ $builderDependencies.packages | join " " }}" for pkg in $PKGS; do From de132050fe86be84677e87f481cefd7528722c82 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 9 Oct 2025 14:30:21 +0300 Subject: [PATCH 10/10] fffffff Signed-off-by: Valeriy Khorunzhin --- 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 c93b6a886a..da92a49d00 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -72,6 +72,7 @@ shell: echo "$date" echo kek + rm -rf /kubevirt git clone --depth=1 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt # Install packages