wrong apiVersion used for VirtualMachineRestore owner references

interestengly, only an issue on ocp Signed-off-by: Michael Henriksen <[email protected]>
bk201 · Sep 23, 2020 · 5778ae4 · 5778ae4
1 parent d5f338a
commit 5778ae4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/virt-controller/watch/snapshot/restore.go b/pkg/virt-controller/watch/snapshot/restore.go
@@ -463,7 +463,7 @@ func (t *vmRestoreTarget) Own(obj metav1.Object) {
 	b := true
 	obj.SetOwnerReferences([]metav1.OwnerReference{
 		{
-			APIVersion:         snapshotv1.SchemeGroupVersion.String(),
+			APIVersion:         kubevirtv1.GroupVersion.String(),
 			Kind:               "VirtualMachine",
 			Name:               t.vm.Name,
 			UID:                t.vm.UID,

diff --git a/pkg/virt-controller/watch/snapshot/restore_test.go b/pkg/virt-controller/watch/snapshot/restore_test.go
@@ -17,6 +17,7 @@ import (
 	framework "k8s.io/client-go/tools/cache/testing"
 	"k8s.io/client-go/tools/record"
 
+	kubevirtv1 "kubevirt.io/client-go/api/v1"
 	v1 "kubevirt.io/client-go/api/v1"
 	snapshotv1 "kubevirt.io/client-go/apis/snapshot/v1alpha1"
 	cdifake "kubevirt.io/client-go/generated/containerized-data-importer/clientset/versioned/fake"
@@ -52,7 +53,7 @@ var _ = Describe("Restore controlleer", func() {
 				UID:       uid,
 				OwnerReferences: []metav1.OwnerReference{
 					{
-						APIVersion:         snapshotv1.SchemeGroupVersion.String(),
+						APIVersion:         kubevirtv1.GroupVersion.String(),
 						Kind:               "VirtualMachine",
 						Name:               vmName,
 						UID:                vmUID,

diff --git a/tests/restore_test.go b/tests/restore_test.go
@@ -107,6 +107,8 @@ var _ = Describe("VirtualMachineRestore Tests", func() {
 			return r.Status != nil && r.Status.Complete != nil && *r.Status.Complete
 		}, 180*time.Second, time.Second).Should(BeTrue())
 		Expect(r.OwnerReferences).To(HaveLen(1))
+		Expect(r.OwnerReferences[0].APIVersion).To(Equal(v1.GroupVersion.String()))
+		Expect(r.OwnerReferences[0].Kind).To(Equal("VirtualMachine"))
 		Expect(r.OwnerReferences[0].Name).To(Equal(vm.Name))
 		Expect(r.OwnerReferences[0].UID).To(Equal(vm.UID))
 		Expect(r.Status.RestoreTime).ToNot(BeNil())
@@ -565,6 +567,8 @@ var _ = Describe("VirtualMachineRestore Tests", func() {
 						Expect(v.PersistentVolumeClaim.ClaimName).ToNot(Equal(originalPVCName))
 						pvc, err := virtClient.CoreV1().PersistentVolumeClaims(vm.Namespace).Get(v.PersistentVolumeClaim.ClaimName, metav1.GetOptions{})
 						Expect(err).ToNot(HaveOccurred())
+						Expect(pvc.OwnerReferences[0].APIVersion).To(Equal(v1.GroupVersion.String()))
+						Expect(pvc.OwnerReferences[0].Kind).To(Equal("VirtualMachine"))
 						Expect(pvc.OwnerReferences[0].Name).To(Equal(vm.Name))
 						Expect(pvc.OwnerReferences[0].UID).To(Equal(vm.UID))
 					}
@@ -616,6 +620,8 @@ var _ = Describe("VirtualMachineRestore Tests", func() {
 						Expect(v.PersistentVolumeClaim.ClaimName).ToNot(Equal(originalPVCName))
 						pvc, err := virtClient.CoreV1().PersistentVolumeClaims(vm.Namespace).Get(v.PersistentVolumeClaim.ClaimName, metav1.GetOptions{})
 						Expect(err).ToNot(HaveOccurred())
+						Expect(pvc.OwnerReferences[0].APIVersion).To(Equal(v1.GroupVersion.String()))
+						Expect(pvc.OwnerReferences[0].Kind).To(Equal("VirtualMachine"))
 						Expect(pvc.OwnerReferences[0].Name).To(Equal(vm.Name))
 						Expect(pvc.OwnerReferences[0].UID).To(Equal(vm.UID))
 					}