Skip to content

Commit e33bc23

Browse files
committed
update cli v1a2 controller to use v1a2
1 parent 64c7cae commit e33bc23

File tree

6 files changed

+170
-53
lines changed

6 files changed

+170
-53
lines changed

controllers/contentlibrary/utils/controller_builder_v1a2.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"sigs.k8s.io/controller-runtime/pkg/handler"
2020
"sigs.k8s.io/controller-runtime/pkg/manager"
2121

22-
imgregv1a1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha1"
22+
imgregv1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha2"
2323

2424
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha4"
2525
"github.com/vmware-tanzu/vm-operator/api/v1alpha4/common"
@@ -74,7 +74,7 @@ func AddToManagerV1A2(
7474
ctx,
7575
r.Logger.WithName("VirtualMachineImageCacheToItemMapper"),
7676
r.Client,
77-
imgregv1a1.GroupVersion,
77+
imgregv1.GroupVersion,
7878
controlledItemTypeName),
7979
))
8080
}
@@ -124,18 +124,18 @@ func (r *ReconcilerV1A2) Reconcile(
124124

125125
var (
126126
obj client.Object
127-
spec *imgregv1a1.ContentLibraryItemSpec
128-
status *imgregv1a1.ContentLibraryItemStatus
127+
spec *imgregv1.ContentLibraryItemSpec
128+
status *imgregv1.ContentLibraryItemStatus
129129
)
130130

131131
if req.Namespace != "" {
132-
var o imgregv1a1.ContentLibraryItem
132+
var o imgregv1.ContentLibraryItem
133133
if err := r.Get(ctx, req.NamespacedName, &o); err != nil {
134134
return ctrl.Result{}, client.IgnoreNotFound(err)
135135
}
136136
obj, spec, status = &o, &o.Spec, &o.Status
137137
} else {
138-
var o imgregv1a1.ClusterContentLibraryItem
138+
var o imgregv1.ClusterContentLibraryItem
139139
if err := r.Get(ctx, req.NamespacedName, &o); err != nil {
140140
return ctrl.Result{}, client.IgnoreNotFound(err)
141141
}
@@ -204,8 +204,8 @@ func (r *ReconcilerV1A2) ReconcileNormal(
204204
ctx context.Context,
205205
logger logr.Logger,
206206
cliObj client.Object,
207-
cliSpec *imgregv1a1.ContentLibraryItemSpec,
208-
cliStatus *imgregv1a1.ContentLibraryItemStatus,
207+
cliSpec *imgregv1.ContentLibraryItemSpec,
208+
cliStatus *imgregv1.ContentLibraryItemStatus,
209209
vmiName string) error {
210210

211211
finalizer, depFinalizer := GetAppropriateFinalizers(cliObj)
@@ -303,7 +303,7 @@ func (r *ReconcilerV1A2) ReconcileNormal(
303303

304304
// Check if the item is ready and skip the image content sync if
305305
// not.
306-
if !IsItemReady(cliStatus.Conditions) {
306+
if !IsV1A2ItemReady(cliStatus.Conditions) {
307307
pkgcnd.MarkFalse(
308308
vmiStatus,
309309
vmopv1.ReadyConditionType,
@@ -381,8 +381,8 @@ func (r *ReconcilerV1A2) ReconcileNormal(
381381
func (r *ReconcilerV1A2) setUpVMIFromCLItem(
382382
ctx context.Context,
383383
cliObj client.Object,
384-
cliSpec imgregv1a1.ContentLibraryItemSpec,
385-
cliStatus imgregv1a1.ContentLibraryItemStatus,
384+
cliSpec imgregv1.ContentLibraryItemSpec,
385+
cliStatus imgregv1.ContentLibraryItemStatus,
386386
vmiObj client.Object,
387387
vmiSpec *vmopv1.VirtualMachineImageSpec,
388388
vmiStatus *vmopv1.VirtualMachineImageStatus) error {
@@ -439,19 +439,19 @@ func (r *ReconcilerV1A2) setUpVMIFromCLItem(
439439
}
440440

441441
vmiStatus.Name = cliStatus.Name
442-
vmiStatus.ProviderItemID = string(cliSpec.UUID)
442+
vmiStatus.ProviderItemID = cliSpec.ID
443443
vmiStatus.Type = string(cliStatus.Type)
444444

445-
return AddContentLibraryRefToAnnotation(
446-
vmiObj, cliStatus.ContentLibraryRef)
445+
return AddV1A2ContentLibraryRefToAnnotation(
446+
vmiObj, vmiSpec.ProviderRef)
447447
}
448448

449449
// syncImageContent syncs the VirtualMachineImage content from the provider.
450450
// It skips syncing if the image content is already up-to-date.
451451
func (r *ReconcilerV1A2) syncImageContent(
452452
ctx context.Context,
453453
cliObj client.Object,
454-
cliStatus imgregv1a1.ContentLibraryItemStatus,
454+
cliStatus imgregv1.ContentLibraryItemStatus,
455455
vmiObj client.Object,
456456
vmiStatus *vmopv1.VirtualMachineImageStatus) error {
457457

controllers/contentlibrary/utils/controller_builder_v1a2_test.go

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919
ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
2020

21-
imgregv1a1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha1"
21+
imgregv1 "github.com/vmware-tanzu/image-registry-operator-api/api/v1alpha2"
2222
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha4"
2323
"github.com/vmware-tanzu/vm-operator/controllers/contentlibrary/utils"
2424
pkgcnd "github.com/vmware-tanzu/vm-operator/pkg/conditions"
@@ -55,7 +55,7 @@ var _ = Describe("AddToManagerV1A2",
5555
parentCtx,
5656
builder.VCSimTestConfig{},
5757
func(ctx *pkgctx.ControllerManagerContext, mgr ctrlmgr.Manager) error {
58-
return utils.AddToManager(ctx, mgr, &imgregv1a1.ContentLibraryItem{})
58+
return utils.AddToManagerV1A2(ctx, mgr, &imgregv1.ContentLibraryItem{})
5959
},
6060
func(ctx *pkgctx.ControllerManagerContext, _ ctrlmgr.Manager) error {
6161
return nil
@@ -96,8 +96,8 @@ var _ = Describe("Reconcile",
9696
fakeVMProvider *providerfake.VMProvider
9797

9898
cliObj client.Object
99-
cliSpec *imgregv1a1.ContentLibraryItemSpec
100-
cliStatus *imgregv1a1.ContentLibraryItemStatus
99+
cliSpec *imgregv1.ContentLibraryItemSpec
100+
cliStatus *imgregv1.ContentLibraryItemStatus
101101
req ctrl.Request
102102

103103
vmiName string
@@ -117,7 +117,7 @@ var _ = Describe("Reconcile",
117117
Expect(err).ToNot(HaveOccurred())
118118

119119
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)
121121
})
122122

123123
AfterEach(func() {
@@ -151,11 +151,11 @@ var _ = Describe("Reconcile",
151151
return nil
152152
}
153153

154-
o := utils.DummyContentLibraryItem(
154+
o := utils.DummyV1A2ContentLibraryItem(
155155
utils.ItemFieldNamePrefix+"-dummy", "dummy-ns")
156156
cliObj, cliSpec, cliStatus = o, &o.Spec, &o.Status
157157
finalizer, _ = utils.GetAppropriateFinalizers(cliObj)
158-
vmicName = pkgutil.VMIName(string(cliSpec.UUID))
158+
vmicName = pkgutil.VMIName(cliSpec.ID)
159159

160160
// Add the finalizer so Reconcile does not return early.
161161
cliObj.SetFinalizers([]string{finalizer})
@@ -183,10 +183,10 @@ var _ = Describe("Reconcile",
183183

184184
When("Library item resource is Not Ready", func() {
185185
BeforeEach(func() {
186-
cliStatus.Conditions = []imgregv1a1.Condition{
186+
cliStatus.Conditions = []metav1.Condition{
187187
{
188-
Type: imgregv1a1.ReadyCondition,
189-
Status: corev1.ConditionFalse,
188+
Type: imgregv1.ReadyCondition,
189+
Status: metav1.ConditionFalse,
190190
},
191191
}
192192
})
@@ -356,9 +356,9 @@ var _ = Describe("Reconcile",
356356

357357
JustBeforeEach(func() {
358358
// The dummy library item should meet these requirements.
359-
var readyCond *imgregv1a1.Condition
359+
var readyCond *metav1.Condition
360360
for _, c := range cliStatus.Conditions {
361-
if c.Type == imgregv1a1.ReadyCondition {
361+
if c.Type == imgregv1.ReadyCondition {
362362
c := c
363363
readyCond = &c
364364
break
@@ -375,10 +375,10 @@ var _ = Describe("Reconcile",
375375
It("should create a new image resource syncing up with the library item resource", func() {
376376
_, err := reconciler.Reconcile(context.Background(), req)
377377
Expect(err).ToNot(HaveOccurred())
378-
cliObj, cliSpec, cliStatus = getCLI(ctx, req.Namespace, req.Name)
378+
cliObj, cliSpec, cliStatus = getV1A2CLI(ctx, req.Namespace, req.Name)
379379

380380
vmiObj, vmiSpec, vmiStatus := getVMI(ctx, req.Namespace, vmiName)
381-
assertVMImageFromCLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
381+
assertVMImageFromV1A2CLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
382382
Expect(vmiStatus.Firmware).To(Equal(firmwareValue))
383383
})
384384
})
@@ -400,10 +400,10 @@ var _ = Describe("Reconcile",
400400
cliStatus.ContentVersion += "-updated"
401401
_, err := reconciler.Reconcile(context.Background(), req)
402402
Expect(err).ToNot(HaveOccurred())
403-
cliObj, cliSpec, cliStatus = getCLI(ctx, req.Namespace, req.Name)
403+
cliObj, cliSpec, cliStatus = getV1A2CLI(ctx, req.Namespace, req.Name)
404404

405405
vmiObj, vmiSpec, vmiStatus := getVMI(ctx, req.Namespace, vmiName)
406-
assertVMImageFromCLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
406+
assertVMImageFromV1A2CLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
407407
Expect(vmiStatus.Firmware).To(Equal(firmwareValue))
408408
})
409409
})
@@ -424,10 +424,10 @@ var _ = Describe("Reconcile",
424424
It("should still update the image resource status from the library item resource", func() {
425425
_, err := reconciler.Reconcile(context.Background(), req)
426426
Expect(err).ToNot(HaveOccurred())
427-
cliObj, cliSpec, cliStatus = getCLI(ctx, req.Namespace, req.Name)
427+
cliObj, cliSpec, cliStatus = getV1A2CLI(ctx, req.Namespace, req.Name)
428428

429429
vmiObj, vmiSpec, vmiStatus := getVMI(ctx, req.Namespace, vmiName)
430-
assertVMImageFromCLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
430+
assertVMImageFromV1A2CLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
431431
Expect(vmiStatus.Firmware).To(Equal(firmwareValue))
432432
})
433433
})
@@ -459,10 +459,10 @@ var _ = Describe("Reconcile",
459459
It("should skip updating the ClusterVirtualMachineImage with library item", func() {
460460
_, err := reconciler.Reconcile(context.Background(), req)
461461
Expect(err).ToNot(HaveOccurred())
462-
cliObj, cliSpec, cliStatus = getCLI(ctx, req.Namespace, req.Name)
462+
cliObj, cliSpec, cliStatus = getV1A2CLI(ctx, req.Namespace, req.Name)
463463

464464
vmiObj, vmiSpec, vmiStatus := getVMI(ctx, req.Namespace, vmiName)
465-
assertVMImageFromCLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
465+
assertVMImageFromV1A2CLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
466466
Expect(vmiStatus.Firmware).To(Equal("should-not-be-updated"))
467467
})
468468
})
@@ -502,7 +502,7 @@ var _ = Describe("Reconcile",
502502
return nil
503503
}
504504

505-
o := utils.DummyClusterContentLibraryItem(
505+
o := utils.DummyV1A2ClusterContentLibraryItem(
506506
utils.ItemFieldNamePrefix + "-dummy")
507507
cliObj, cliSpec, cliStatus = o, &o.Spec, &o.Status
508508
finalizer, _ = utils.GetAppropriateFinalizers(cliObj)
@@ -624,9 +624,9 @@ var _ = Describe("Reconcile",
624624
When("Library item resource is ready and security complaint", func() {
625625
JustBeforeEach(func() {
626626
// The dummy library item should meet these requirements.
627-
var readyCond *imgregv1a1.Condition
627+
var readyCond *metav1.Condition
628628
for _, c := range cliStatus.Conditions {
629-
if c.Type == imgregv1a1.ReadyCondition {
629+
if c.Type == imgregv1.ReadyCondition {
630630
c := c
631631
readyCond = &c
632632
break
@@ -642,10 +642,10 @@ var _ = Describe("Reconcile",
642642
It("should create a new image resource syncing up with the library item resource", func() {
643643
_, err := reconciler.Reconcile(context.Background(), req)
644644
Expect(err).ToNot(HaveOccurred())
645-
cliObj, cliSpec, cliStatus = getCLI(ctx, req.Namespace, req.Name)
645+
cliObj, cliSpec, cliStatus = getV1A2CLI(ctx, req.Namespace, req.Name)
646646

647647
vmiObj, vmiSpec, vmiStatus := getVMI(ctx, req.Namespace, vmiName)
648-
assertVMImageFromCLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
648+
assertVMImageFromV1A2CLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
649649
Expect(vmiStatus.Firmware).To(Equal(firmwareValue))
650650
})
651651
})
@@ -665,10 +665,10 @@ var _ = Describe("Reconcile",
665665
cliStatus.ContentVersion += "-updated"
666666
_, err := reconciler.Reconcile(context.Background(), req)
667667
Expect(err).ToNot(HaveOccurred())
668-
cliObj, cliSpec, cliStatus = getCLI(ctx, req.Namespace, req.Name)
668+
cliObj, cliSpec, cliStatus = getV1A2CLI(ctx, req.Namespace, req.Name)
669669

670670
vmiObj, vmiSpec, vmiStatus := getVMI(ctx, req.Namespace, vmiName)
671-
assertVMImageFromCLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
671+
assertVMImageFromV1A2CLItem(cliObj, *cliSpec, *cliStatus, vmiObj, *vmiSpec, *vmiStatus)
672672
Expect(vmiStatus.Firmware).To(Equal(firmwareValue))
673673
})
674674
})
@@ -689,24 +689,24 @@ var _ = Describe("Reconcile",
689689

690690
func getV1A2CLI(
691691
ctx *builder.UnitTestContextForController,
692-
namespace, name string) (client.Object, *imgregv1a1.ContentLibraryItemSpec, *imgregv1a1.ContentLibraryItemStatus) {
692+
namespace, name string) (client.Object, *imgregv1.ContentLibraryItemSpec, *imgregv1.ContentLibraryItemStatus) {
693693

694694
var (
695695
obj client.Object
696-
spec *imgregv1a1.ContentLibraryItemSpec
697-
status *imgregv1a1.ContentLibraryItemStatus
696+
spec *imgregv1.ContentLibraryItemSpec
697+
status *imgregv1.ContentLibraryItemStatus
698698
key = client.ObjectKey{
699699
Namespace: namespace,
700700
Name: name,
701701
}
702702
)
703703

704704
if namespace != "" {
705-
var o imgregv1a1.ContentLibraryItem
705+
var o imgregv1.ContentLibraryItem
706706
ExpectWithOffset(1, ctx.Client.Get(ctx, key, &o)).To(Succeed())
707707
obj, spec, status = &o, &o.Spec, &o.Status
708708
} else {
709-
var o imgregv1a1.ClusterContentLibraryItem
709+
var o imgregv1.ClusterContentLibraryItem
710710
ExpectWithOffset(1, ctx.Client.Get(ctx, key, &o)).To(Succeed())
711711
obj, spec, status = &o, &o.Spec, &o.Status
712712
}
@@ -716,8 +716,8 @@ func getV1A2CLI(
716716

717717
func assertVMImageFromV1A2CLItem(
718718
cliObj client.Object,
719-
cliSpec imgregv1a1.ContentLibraryItemSpec,
720-
cliStatus imgregv1a1.ContentLibraryItemStatus,
719+
cliSpec imgregv1.ContentLibraryItemSpec,
720+
cliStatus imgregv1.ContentLibraryItemStatus,
721721
vmiObj client.Object,
722722
vmiSpec vmopv1.VirtualMachineImageSpec,
723723
vmiStatus vmopv1.VirtualMachineImageStatus) {
@@ -733,7 +733,7 @@ func assertVMImageFromV1A2CLItem(
733733

734734
By("Expected VMImage Status", func() {
735735
Expect(vmiStatus.Name).To(Equal(cliStatus.Name))
736-
Expect(vmiStatus.ProviderItemID).To(BeEquivalentTo(cliSpec.UUID))
736+
Expect(vmiStatus.ProviderItemID).To(BeEquivalentTo(cliSpec.ID))
737737
Expect(vmiStatus.ProviderContentVersion).To(Equal(cliStatus.ContentVersion))
738738
Expect(vmiStatus.Type).To(BeEquivalentTo(cliStatus.Type))
739739
Expect(pkgcnd.IsTrue(vmiStatus, vmopv1.ReadyConditionType)).To(BeTrue())

0 commit comments

Comments
 (0)