Skip to content

Commit 63c0a7c

Browse files
refactor(vm): deprecate kvvm protection finalizaer (#2488)
Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>
1 parent e58c799 commit 63c0a7c

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

api/core/v1alpha2/finalizers.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ limitations under the License.
1717
package v1alpha2
1818

1919
const (
20-
FinalizerCVIProtection = "virtualization.deckhouse.io/cvi-protection"
21-
FinalizerVIProtection = "virtualization.deckhouse.io/vi-protection"
22-
FinalizerVDProtection = "virtualization.deckhouse.io/vd-protection"
20+
FinalizerCVIProtection = "virtualization.deckhouse.io/cvi-protection"
21+
FinalizerVIProtection = "virtualization.deckhouse.io/vi-protection"
22+
FinalizerVDProtection = "virtualization.deckhouse.io/vd-protection"
23+
// FinalizerKVVMProtection protects KVVMs from deletion.
24+
//
25+
// Deprecated: FinalizerKVVMProtection is deprecated and should be deleted in the next versions.
2326
FinalizerKVVMProtection = "virtualization.deckhouse.io/kvvm-protection"
2427
FinalizerIPAddressProtection = "virtualization.deckhouse.io/vmip-protection"
2528
FinalizerPodProtection = "virtualization.deckhouse.io/pod-protection"
@@ -41,6 +44,6 @@ const (
4144
FinalizerVMBDACleanup = "virtualization.deckhouse.io/vmbda-cleanup"
4245
FinalizerMACAddressCleanup = "virtualization.deckhouse.io/vmmac-cleanup"
4346
FinalizerMACAddressLeaseCleanup = "virtualization.deckhouse.io/vmmacl-cleanup"
44-
FinalizerNodeUSBDeviceCleanup = "virtualization.deckhouse.io/nodeusbdevice-cleanup"
45-
FinalizerUSBDeviceCleanup = "virtualization.deckhouse.io/usbdevice-cleanup"
47+
FinalizerNodeUSBDeviceCleanup = "virtualization.deckhouse.io/nodeusbdevice-cleanup"
48+
FinalizerUSBDeviceCleanup = "virtualization.deckhouse.io/usbdevice-cleanup"
4649
)

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ func ApplyVirtualMachineSpec(
144144
Version: v1alpha2.SchemeGroupVersion.Version,
145145
Kind: "VirtualMachine",
146146
})
147-
kvvm.AddFinalizer(v1alpha2.FinalizerKVVMProtection)
148147

149148
if ipAddress != "" {
150149
// Set ip address cni request annotation.

images/virtualization-artifact/pkg/controller/vm/internal/deletion_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const deletionHandlerName = "DeletionHandler"
3737
func NewDeletionHandler(client client.Client) *DeletionHandler {
3838
return &DeletionHandler{
3939
client: client,
40-
protection: service.NewProtectionService(client, v1alpha2.FinalizerKVVMProtection),
40+
protection: service.NewProtectionService(client, v1alpha2.FinalizerKVVMProtection), //nolint:staticcheck // FinalizerKVVMProtection is deprecated but still required until migration is complete.
4141
}
4242
}
4343

0 commit comments

Comments
 (0)