address review comments

Author: arshadd-b

api/v1beta2/conditions_consts.go

@@ -110,7 +110,7 @@ const (
 )
 
 const (
-	// ImageNotReadyReason used when the image is in a queued state.
+	// ImageNotReadyReason used when the image is not ready.
 	ImageNotReadyReason = "ImageNotReady"
 
 	// ImageImportFailedReason used when the image import is failed.
@@ -119,7 +119,7 @@ const (
 	// ImageReconciliationFailedReason used when an error occurs during VPC Custom Image reconciliation.
 	ImageReconciliationFailedReason = "ImageReconciliationFailed"
 
-	// ImageQueuedReason used when the image import is failed.
+	// ImageQueuedReason used when the image is in queued state.
 	ImageQueuedReason = "ImageQueued"
 )
 
@@ -130,7 +130,7 @@ const (
 	// ImageImportedCondition reports on current status of the image import job. Ready indicates the import job is finished.
 	ImageImportedCondition clusterv1beta1.ConditionType = "ImageImported"
 
-	// IBMPowerVSImageDeletingV1Beta2Reason surfaces when the image controller by IBMPowerVSImage is deleting.
+	// IBMPowerVSImageDeletingV1Beta2Reason surfaces when the image is in deleting state.
 	IBMPowerVSImageDeletingV1Beta2Reason = clusterv1beta1.DeletingV1Beta2Reason
 )
 
@@ -333,8 +333,7 @@ const (
 	// IBMPowerVSImageReadyCondition is true if the IBMPowerVSImage's deletionTimestamp is not set, IBMPowerVSImage's.
 	IBMPowerVSImageReadyCondition = clusterv1beta1.ReadyV1Beta2Condition
 
-	// IBMPowerVSImageReadyV1Beta2Condition documents the status of the image that is controlled
-	// by the IBMPowerVSImage.
+	// IBMPowerVSImageReadyV1Beta2Condition documents the Ready status of the image.
 	IBMPowerVSImageReadyV1Beta2Condition = "ImageReady"
 
 	// IBMPowerVSImageReadyV1Beta2Reason surfaces when the IBMPowerVSImage readiness criteria is met.

api/v1beta2/types.go

@@ -56,8 +56,8 @@ var (
 	// PowerVSImageStateACTIVE is the string representing an image in a active state.
 	PowerVSImageStateACTIVE = PowerVSImageState("active")
 
-	// PowerVSImageStateQue is the string representing an image in a queued state.
-	PowerVSImageStateQue = PowerVSImageState("queued")
+	// PowerVSImageStateQueued is the string representing an image in a queued state.
+	PowerVSImageStateQueued = PowerVSImageState("queued")
 
 	// PowerVSImageStateFailed is the string representing an image in a failed state.
 	PowerVSImageStateFailed = PowerVSImageState("failed")

controllers/ibmpowervsimage_controller.go

@@ -187,10 +187,10 @@ func (r *IBMPowerVSImageReconciler) reconcile(ctx context.Context, cluster *infr
 				Reason: infrav1.ImageImportFailedReason,
 			})
 			return ctrl.Result{RequeueAfter: 2 * time.Minute}, fmt.Errorf("failed to import image, message: %s", job.Status.Message)
-		case infrav1.PowerVSImageStateQue:
+		case infrav1.PowerVSImageStateQueued:
 			imageScope.SetNotReady()
-			imageScope.SetImageState(string(infrav1.PowerVSImageStateQue))
-			v1beta1conditions.MarkFalse(imageScope.IBMPowerVSImage, infrav1.ImageImportedCondition, string(infrav1.PowerVSImageStateQue), clusterv1beta1.ConditionSeverityInfo, "%s", job.Status.Message)
+			imageScope.SetImageState(string(infrav1.PowerVSImageStateQueued))
+			v1beta1conditions.MarkFalse(imageScope.IBMPowerVSImage, infrav1.ImageImportedCondition, string(infrav1.PowerVSImageStateQueued), clusterv1beta1.ConditionSeverityInfo, "%s", job.Status.Message)
 			v1beta2conditions.Set(imageScope.IBMPowerVSImage, metav1.Condition{
 				Type:   infrav1.IBMPowerVSImageReadyV1Beta2Condition,
 				Status: metav1.ConditionFalse,
@@ -237,7 +237,7 @@ func reconcileImage(ctx context.Context, img *models.ImageReference, imageScope
 		log.Info("ImageState", image.State)
 
 		switch imageScope.GetImageState() {
-		case infrav1.PowerVSImageStateQue:
+		case infrav1.PowerVSImageStateQueued:
 			log.Info("Image is in queued state")
 			imageScope.SetNotReady()
 			v1beta1conditions.MarkFalse(imageScope.IBMPowerVSImage, infrav1.ImageReadyCondition, infrav1.ImageNotReadyReason, clusterv1beta1.ConditionSeverityWarning, "")
@@ -342,25 +342,6 @@ func (r *IBMPowerVSImageReconciler) SetupWithManager(mgr ctrl.Manager) error {
 }
 
 func patchIBMPowerVSImage(ctx context.Context, patchHelper *v1beta1patch.Helper, ibmPowerVSImage *infrav1.IBMPowerVSImage) error {
-	// Before computing ready condition, make sure that ImageReady is always set.
-	// NOTE: This is required because v1beta2 conditions comply to guideline requiring conditions to be set at the
-	// first reconcile.
-	if c := v1beta2conditions.Get(ibmPowerVSImage, infrav1.IBMPowerVSImageReadyV1Beta2Condition); c == nil {
-		if ibmPowerVSImage.Status.Ready {
-			v1beta2conditions.Set(ibmPowerVSImage, metav1.Condition{
-				Type:   infrav1.IBMPowerVSImageReadyV1Beta2Condition,
-				Status: metav1.ConditionTrue,
-				Reason: infrav1.IBMPowerVSImageReadyV1Beta2Reason,
-			})
-		} else {
-			v1beta2conditions.Set(ibmPowerVSImage, metav1.Condition{
-				Type:   infrav1.IBMPowerVSImageReadyV1Beta2Condition,
-				Status: metav1.ConditionFalse,
-				Reason: infrav1.IBMPowerVSImageNotReadyV1Beta2Reason,
-			})
-		}
-	}
-
 	// always update the readyCondition.
 	v1beta1conditions.SetSummary(ibmPowerVSImage,
 		v1beta1conditions.WithConditions(

controllers/ibmpowervsimage_controller_test.go

@@ -230,8 +230,8 @@ func TestIBMPowerVSImageReconciler_reconcile(t *testing.T) {
 				g.Expect(err).To(BeNil())
 				g.Expect(imageScope.IBMPowerVSImage.Finalizers).To(ContainElement(infrav1.IBMPowerVSImageFinalizer))
 				g.Expect(imageScope.IBMPowerVSImage.Status.Ready).To(Equal(false))
-				g.Expect(imageScope.IBMPowerVSImage.Status.ImageState).To(BeEquivalentTo(infrav1.PowerVSImageStateQue))
-				expectConditionsImage(g, imageScope.IBMPowerVSImage, []conditionAssertion{{infrav1.ImageImportedCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, string(infrav1.PowerVSImageStateQue)}})
+				g.Expect(imageScope.IBMPowerVSImage.Status.ImageState).To(BeEquivalentTo(infrav1.PowerVSImageStateQueued))
+				expectConditionsImage(g, imageScope.IBMPowerVSImage, []conditionAssertion{{infrav1.ImageImportedCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityInfo, string(infrav1.PowerVSImageStateQueued)}})
 				g.Expect(result.RequeueAfter).To(Not(BeZero()))
 			})
 			t.Run("When importing image is still in progress", func(_ *testing.T) {