Skip to content

unplug #1546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
+24 −5
Draft

unplug #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14f2aff
unplug
Oct 8, 2025
07a9a59
add kv patch
Oct 8, 2025
32516d9
fix test
Oct 8, 2025
5609306
1
Oct 9, 2025
213091a
ttt
Oct 9, 2025
3ffb68f
ttt
Oct 9, 2025
8c2256a
f
Oct 9, 2025
2493283
ff
Oct 9, 2025
58894ac
ffff
Oct 9, 2025
de13205
fffffff
Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions images/virt-artifact/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}

---
Expand All @@ -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 https://github.com/deckhouse/3p-kubevirt --branch v1.3.1-virtualization-hot-unplug-cloud-init /kubevirt

---

Expand Down Expand Up @@ -66,9 +66,15 @@ shell:
{{ $builderDependencies.altPackages | join " " }}

{{- include "alt packages clean" . | nindent 2 }}

installCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}" # <--- для пересборки
install:
- |
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
PKGS="{{ $builderDependencies.packages | join " " }}"
for pkg in $PKGS; do
Expand Down
13 changes: 13 additions & 0 deletions images/virtualization-artifact/pkg/controller/vmchange/comparators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/vmchange/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ provisioning:
),
},
{
"restart on provisioning remove",
"apply immediate on provisioning remove",
`
provisioning:
type: UserDataRef
Expand All @@ -277,7 +277,7 @@ provisioning:
`,
"",
assertChanges(
actionRequired(ActionRestart),
actionRequired(ActionApplyImmediate),
requirePathOperation("provisioning", ChangeRemove),
),
},
Expand Down
Loading