@@ -18,7 +18,7 @@ import (
18
18
"sigs.k8s.io/controller-runtime/pkg/client"
19
19
ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
20
20
21
- imgregv1a1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha1 "
21
+ imgregv1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha2 "
22
22
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha4"
23
23
"github.com/vmware-tanzu/vm-operator/controllers/contentlibrary/utils"
24
24
pkgcnd "github.com/vmware-tanzu/vm-operator/pkg/conditions"
@@ -55,7 +55,7 @@ var _ = Describe("AddToManagerV1A2",
55
55
parentCtx ,
56
56
builder.VCSimTestConfig {},
57
57
func (ctx * pkgctx.ControllerManagerContext , mgr ctrlmgr.Manager ) error {
58
- return utils .AddToManager (ctx , mgr , & imgregv1a1 .ContentLibraryItem {})
58
+ return utils .AddToManagerV1A2 (ctx , mgr , & imgregv1 .ContentLibraryItem {})
59
59
},
60
60
func (ctx * pkgctx.ControllerManagerContext , _ ctrlmgr.Manager ) error {
61
61
return nil
@@ -96,8 +96,8 @@ var _ = Describe("Reconcile",
96
96
fakeVMProvider * providerfake.VMProvider
97
97
98
98
cliObj client.Object
99
- cliSpec * imgregv1a1 .ContentLibraryItemSpec
100
- cliStatus * imgregv1a1 .ContentLibraryItemStatus
99
+ cliSpec * imgregv1 .ContentLibraryItemSpec
100
+ cliStatus * imgregv1 .ContentLibraryItemStatus
101
101
req ctrl.Request
102
102
103
103
vmiName string
@@ -117,7 +117,7 @@ var _ = Describe("Reconcile",
117
117
Expect (err ).ToNot (HaveOccurred ())
118
118
119
119
Expect (ctx .Client .Create (ctx , cliObj )).To (Succeed ())
120
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
120
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
121
121
})
122
122
123
123
AfterEach (func () {
@@ -151,11 +151,11 @@ var _ = Describe("Reconcile",
151
151
return nil
152
152
}
153
153
154
- o := utils .DummyContentLibraryItem (
154
+ o := utils .DummyV1A2ContentLibraryItem (
155
155
utils .ItemFieldNamePrefix + "-dummy" , "dummy-ns" )
156
156
cliObj , cliSpec , cliStatus = o , & o .Spec , & o .Status
157
157
finalizer , _ = utils .GetAppropriateFinalizers (cliObj )
158
- vmicName = pkgutil .VMIName (string ( cliSpec .UUID ) )
158
+ vmicName = pkgutil .VMIName (cliSpec .ID )
159
159
160
160
// Add the finalizer so Reconcile does not return early.
161
161
cliObj .SetFinalizers ([]string {finalizer })
@@ -183,10 +183,10 @@ var _ = Describe("Reconcile",
183
183
184
184
When ("Library item resource is Not Ready" , func () {
185
185
BeforeEach (func () {
186
- cliStatus .Conditions = []imgregv1a1 .Condition {
186
+ cliStatus .Conditions = []metav1 .Condition {
187
187
{
188
- Type : imgregv1a1 .ReadyCondition ,
189
- Status : corev1 .ConditionFalse ,
188
+ Type : imgregv1 .ReadyCondition ,
189
+ Status : metav1 .ConditionFalse ,
190
190
},
191
191
}
192
192
})
@@ -356,9 +356,9 @@ var _ = Describe("Reconcile",
356
356
357
357
JustBeforeEach (func () {
358
358
// The dummy library item should meet these requirements.
359
- var readyCond * imgregv1a1 .Condition
359
+ var readyCond * metav1 .Condition
360
360
for _ , c := range cliStatus .Conditions {
361
- if c .Type == imgregv1a1 .ReadyCondition {
361
+ if c .Type == imgregv1 .ReadyCondition {
362
362
c := c
363
363
readyCond = & c
364
364
break
@@ -375,10 +375,10 @@ var _ = Describe("Reconcile",
375
375
It ("should create a new image resource syncing up with the library item resource" , func () {
376
376
_ , err := reconciler .Reconcile (context .Background (), req )
377
377
Expect (err ).ToNot (HaveOccurred ())
378
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
378
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
379
379
380
380
vmiObj , vmiSpec , vmiStatus := getVMI (ctx , req .Namespace , vmiName )
381
- assertVMImageFromCLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
381
+ assertVMImageFromV1A2CLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
382
382
Expect (vmiStatus .Firmware ).To (Equal (firmwareValue ))
383
383
})
384
384
})
@@ -400,10 +400,10 @@ var _ = Describe("Reconcile",
400
400
cliStatus .ContentVersion += "-updated"
401
401
_ , err := reconciler .Reconcile (context .Background (), req )
402
402
Expect (err ).ToNot (HaveOccurred ())
403
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
403
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
404
404
405
405
vmiObj , vmiSpec , vmiStatus := getVMI (ctx , req .Namespace , vmiName )
406
- assertVMImageFromCLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
406
+ assertVMImageFromV1A2CLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
407
407
Expect (vmiStatus .Firmware ).To (Equal (firmwareValue ))
408
408
})
409
409
})
@@ -424,10 +424,10 @@ var _ = Describe("Reconcile",
424
424
It ("should still update the image resource status from the library item resource" , func () {
425
425
_ , err := reconciler .Reconcile (context .Background (), req )
426
426
Expect (err ).ToNot (HaveOccurred ())
427
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
427
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
428
428
429
429
vmiObj , vmiSpec , vmiStatus := getVMI (ctx , req .Namespace , vmiName )
430
- assertVMImageFromCLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
430
+ assertVMImageFromV1A2CLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
431
431
Expect (vmiStatus .Firmware ).To (Equal (firmwareValue ))
432
432
})
433
433
})
@@ -459,10 +459,10 @@ var _ = Describe("Reconcile",
459
459
It ("should skip updating the ClusterVirtualMachineImage with library item" , func () {
460
460
_ , err := reconciler .Reconcile (context .Background (), req )
461
461
Expect (err ).ToNot (HaveOccurred ())
462
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
462
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
463
463
464
464
vmiObj , vmiSpec , vmiStatus := getVMI (ctx , req .Namespace , vmiName )
465
- assertVMImageFromCLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
465
+ assertVMImageFromV1A2CLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
466
466
Expect (vmiStatus .Firmware ).To (Equal ("should-not-be-updated" ))
467
467
})
468
468
})
@@ -502,7 +502,7 @@ var _ = Describe("Reconcile",
502
502
return nil
503
503
}
504
504
505
- o := utils .DummyClusterContentLibraryItem (
505
+ o := utils .DummyV1A2ClusterContentLibraryItem (
506
506
utils .ItemFieldNamePrefix + "-dummy" )
507
507
cliObj , cliSpec , cliStatus = o , & o .Spec , & o .Status
508
508
finalizer , _ = utils .GetAppropriateFinalizers (cliObj )
@@ -624,9 +624,9 @@ var _ = Describe("Reconcile",
624
624
When ("Library item resource is ready and security complaint" , func () {
625
625
JustBeforeEach (func () {
626
626
// The dummy library item should meet these requirements.
627
- var readyCond * imgregv1a1 .Condition
627
+ var readyCond * metav1 .Condition
628
628
for _ , c := range cliStatus .Conditions {
629
- if c .Type == imgregv1a1 .ReadyCondition {
629
+ if c .Type == imgregv1 .ReadyCondition {
630
630
c := c
631
631
readyCond = & c
632
632
break
@@ -642,10 +642,10 @@ var _ = Describe("Reconcile",
642
642
It ("should create a new image resource syncing up with the library item resource" , func () {
643
643
_ , err := reconciler .Reconcile (context .Background (), req )
644
644
Expect (err ).ToNot (HaveOccurred ())
645
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
645
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
646
646
647
647
vmiObj , vmiSpec , vmiStatus := getVMI (ctx , req .Namespace , vmiName )
648
- assertVMImageFromCLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
648
+ assertVMImageFromV1A2CLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
649
649
Expect (vmiStatus .Firmware ).To (Equal (firmwareValue ))
650
650
})
651
651
})
@@ -665,10 +665,10 @@ var _ = Describe("Reconcile",
665
665
cliStatus .ContentVersion += "-updated"
666
666
_ , err := reconciler .Reconcile (context .Background (), req )
667
667
Expect (err ).ToNot (HaveOccurred ())
668
- cliObj , cliSpec , cliStatus = getCLI (ctx , req .Namespace , req .Name )
668
+ cliObj , cliSpec , cliStatus = getV1A2CLI (ctx , req .Namespace , req .Name )
669
669
670
670
vmiObj , vmiSpec , vmiStatus := getVMI (ctx , req .Namespace , vmiName )
671
- assertVMImageFromCLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
671
+ assertVMImageFromV1A2CLItem (cliObj , * cliSpec , * cliStatus , vmiObj , * vmiSpec , * vmiStatus )
672
672
Expect (vmiStatus .Firmware ).To (Equal (firmwareValue ))
673
673
})
674
674
})
@@ -689,24 +689,24 @@ var _ = Describe("Reconcile",
689
689
690
690
func getV1A2CLI (
691
691
ctx * builder.UnitTestContextForController ,
692
- namespace , name string ) (client.Object , * imgregv1a1 .ContentLibraryItemSpec , * imgregv1a1 .ContentLibraryItemStatus ) {
692
+ namespace , name string ) (client.Object , * imgregv1 .ContentLibraryItemSpec , * imgregv1 .ContentLibraryItemStatus ) {
693
693
694
694
var (
695
695
obj client.Object
696
- spec * imgregv1a1 .ContentLibraryItemSpec
697
- status * imgregv1a1 .ContentLibraryItemStatus
696
+ spec * imgregv1 .ContentLibraryItemSpec
697
+ status * imgregv1 .ContentLibraryItemStatus
698
698
key = client.ObjectKey {
699
699
Namespace : namespace ,
700
700
Name : name ,
701
701
}
702
702
)
703
703
704
704
if namespace != "" {
705
- var o imgregv1a1 .ContentLibraryItem
705
+ var o imgregv1 .ContentLibraryItem
706
706
ExpectWithOffset (1 , ctx .Client .Get (ctx , key , & o )).To (Succeed ())
707
707
obj , spec , status = & o , & o .Spec , & o .Status
708
708
} else {
709
- var o imgregv1a1 .ClusterContentLibraryItem
709
+ var o imgregv1 .ClusterContentLibraryItem
710
710
ExpectWithOffset (1 , ctx .Client .Get (ctx , key , & o )).To (Succeed ())
711
711
obj , spec , status = & o , & o .Spec , & o .Status
712
712
}
@@ -716,8 +716,8 @@ func getV1A2CLI(
716
716
717
717
func assertVMImageFromV1A2CLItem (
718
718
cliObj client.Object ,
719
- cliSpec imgregv1a1 .ContentLibraryItemSpec ,
720
- cliStatus imgregv1a1 .ContentLibraryItemStatus ,
719
+ cliSpec imgregv1 .ContentLibraryItemSpec ,
720
+ cliStatus imgregv1 .ContentLibraryItemStatus ,
721
721
vmiObj client.Object ,
722
722
vmiSpec vmopv1.VirtualMachineImageSpec ,
723
723
vmiStatus vmopv1.VirtualMachineImageStatus ) {
@@ -733,7 +733,7 @@ func assertVMImageFromV1A2CLItem(
733
733
734
734
By ("Expected VMImage Status" , func () {
735
735
Expect (vmiStatus .Name ).To (Equal (cliStatus .Name ))
736
- Expect (vmiStatus .ProviderItemID ).To (BeEquivalentTo (cliSpec .UUID ))
736
+ Expect (vmiStatus .ProviderItemID ).To (BeEquivalentTo (cliSpec .ID ))
737
737
Expect (vmiStatus .ProviderContentVersion ).To (Equal (cliStatus .ContentVersion ))
738
738
Expect (vmiStatus .Type ).To (BeEquivalentTo (cliStatus .Type ))
739
739
Expect (pkgcnd .IsTrue (vmiStatus , vmopv1 .ReadyConditionType )).To (BeTrue ())
0 commit comments