From 24c8ee7ca2293193c3486115143443c216ffc1ac Mon Sep 17 00:00:00 2001 From: Yaroslav Borbat Date: Mon, 27 Jan 2025 13:48:44 +0300 Subject: [PATCH 1/4] fix Signed-off-by: Yaroslav Borbat --- .../pkg/controller/kvbuilder/kvvm.go | 11 +++++++++++ .../pkg/controller/kvbuilder/kvvm_utils.go | 1 + 2 files changed, 12 insertions(+) diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go index 58046f790a..8dacdcfc56 100644 --- a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go +++ b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go @@ -582,3 +582,14 @@ func (b *KVVM) GetBootloaderSettings() map[string]interface{} { }, } } + +func (b *KVVM) SetMetadata(metadata metav1.ObjectMeta) { + if b.Resource.Spec.Template.ObjectMeta.Labels == nil { + b.Resource.Spec.Template.ObjectMeta.Labels = make(map[string]string, len(metadata.Labels)) + } + if b.Resource.Spec.Template.ObjectMeta.Annotations == nil { + b.Resource.Spec.Template.ObjectMeta.Annotations = make(map[string]string, len(metadata.Annotations)) + } + maps.Copy(b.Resource.Spec.Template.ObjectMeta.Labels, metadata.Labels) + maps.Copy(b.Resource.Spec.Template.ObjectMeta.Annotations, metadata.Annotations) +} diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go index 9f2ed0aef0..be1d8d8afa 100644 --- a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go +++ b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go @@ -89,6 +89,7 @@ func ApplyVirtualMachineSpec( return err } + kvvm.SetMetadata(vm.ObjectMeta) kvvm.SetNetworkInterface(NetworkInterfaceName) kvvm.SetTablet("default-0") kvvm.SetNodeSelector(vm.Spec.NodeSelector, class.Spec.NodeSelector.MatchLabels) From 108a66e749b70ea7cd5a77bdede4c4701a0b025f Mon Sep 17 00:00:00 2001 From: Yaroslav Borbat Date: Mon, 27 Jan 2025 13:51:26 +0300 Subject: [PATCH 2/4] fix Signed-off-by: Yaroslav Borbat --- .../virtualization-artifact/pkg/controller/kvbuilder/kvvm.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go index 8dacdcfc56..cf356660ee 100644 --- a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go +++ b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go @@ -584,6 +584,10 @@ func (b *KVVM) GetBootloaderSettings() map[string]interface{} { } func (b *KVVM) SetMetadata(metadata metav1.ObjectMeta) { + if b.ResourceExists { + // initialize only + return + } if b.Resource.Spec.Template.ObjectMeta.Labels == nil { b.Resource.Spec.Template.ObjectMeta.Labels = make(map[string]string, len(metadata.Labels)) } From 77e8b7b69df5cac76818eee1955fd5e631c36c48 Mon Sep 17 00:00:00 2001 From: Yaroslav Borbat Date: Mon, 27 Jan 2025 17:12:02 +0300 Subject: [PATCH 3/4] + Signed-off-by: Yaroslav Borbat --- tests/e2e/Taskfile.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e/Taskfile.yaml b/tests/e2e/Taskfile.yaml index 0f3cf275e1..35b31233b7 100644 --- a/tests/e2e/Taskfile.yaml +++ b/tests/e2e/Taskfile.yaml @@ -106,7 +106,6 @@ tasks: cmds: - | ginkgo -v \ - --skip-file affinity_toleration_test.go \ {{if .FOCUS -}} --focus "{{ .FOCUS }}" {{end}} From a49c91ca1235e24cafc6cc28a7462446c46bae10 Mon Sep 17 00:00:00 2001 From: Yaroslav Borbat Date: Mon, 27 Jan 2025 17:16:12 +0300 Subject: [PATCH 4/4] + Signed-off-by: Yaroslav Borbat --- tests/e2e/Taskfile.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e/Taskfile.yaml b/tests/e2e/Taskfile.yaml index 35b31233b7..7159172bbb 100644 --- a/tests/e2e/Taskfile.yaml +++ b/tests/e2e/Taskfile.yaml @@ -55,7 +55,6 @@ tasks: cmds: - | RESULT=$(ginkgo \ - --skip-file affinity_toleration_test.go \ --no-color \ -v | tee /dev/stderr | grep --color=never -E 'FAIL!|SUCCESS!') if [ "${PIPESTATUS[0]}" -ne "0" ]; then