Skip to content

Commit 7ac9050

Browse files
committed
fix
Signed-off-by: Pavel Tishkov <[email protected]>
1 parent 9522e65 commit 7ac9050

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

images/hooks/pkg/hooks/drop-helm-labels-from-generic-vmclass/hook.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import (
2727
"k8s.io/utils/ptr"
2828

2929
"hooks/pkg/settings"
30+
31+
"github.com/deckhouse/virtualization/api/core/v1alpha2"
3032
)
3133

3234
const (
@@ -42,12 +44,12 @@ const (
4244
var _ = registry.RegisterFunc(configDropHelmLabels, handlerDropHelmLabels)
4345

4446
var configDropHelmLabels = &pkg.HookConfig{
45-
OnAfterHelm: &pkg.OrderedConfig{Order: 10},
47+
OnAfterHelm: &pkg.OrderedConfig{Order: 20},
4648
Kubernetes: []pkg.KubernetesConfig{
4749
{
4850
Name: vmClassSnapshot,
49-
APIVersion: "deckhouse.io/v1alpha2",
50-
Kind: "VirtualMachineClass",
51+
APIVersion: "virtualization.deckhouse.io/v1alpha2",
52+
Kind: v1alpha2.VirtualMachineClassKind,
5153
JqFilter: ".metadata",
5254
NameSelector: &pkg.NameSelector{
5355
MatchNames: []string{genericVMClassName},
@@ -127,7 +129,7 @@ func handlerDropHelmLabels(_ context.Context, input *pkg.HookInput) error {
127129
input.Logger.Info("Removing Helm labels from generic VMClass")
128130
input.PatchCollector.PatchWithJSON(
129131
patches,
130-
"deckhouse.io/v1alpha2",
132+
"virtualization.deckhouse.io/v1alpha2",
131133
"VirtualMachineClass",
132134
"",
133135
genericVMClassName,

images/hooks/pkg/hooks/drop-helm-labels-from-generic-vmclass/hook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ var _ = Describe("Drop Helm labels from generic VMClass", func() {
8181
It("Should drop both Helm labels from generic VMClass with all required labels", func() {
8282
setSnapshots(newSnapshot(true, true))
8383
patchCollector.PatchWithJSONMock.Set(func(patch any, apiVersion, kind, namespace, name string, opts ...pkg.PatchCollectorOption) {
84-
Expect(apiVersion).To(Equal("deckhouse.io/v1alpha2"))
84+
Expect(apiVersion).To(Equal("virtualization.deckhouse.io/v1alpha2"))
8585
Expect(kind).To(Equal("VirtualMachineClass"))
8686
Expect(namespace).To(Equal(""))
8787
Expect(name).To(Equal(genericVMClassName))

0 commit comments

Comments
 (0)