Skip to content

Commit 5510403

Browse files
committed
address review comments
1 parent a4a6a90 commit 5510403

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

api/v1beta1/ibmpowervs_conversion.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,5 @@ func Convert_v1beta2_IBMPowerVSMachineStatus_To_v1beta1_IBMPowerVSMachineStatus(
215215
}
216216

217217
func Convert_v1beta2_IBMPowerVSImageStatus_To_v1beta1_IBMPowerVSImageStatus(in *infrav1.IBMPowerVSImageStatus, out *IBMPowerVSImageStatus, s apiconversion.Scope) error {
218-
// CAPI V1Beta2 was added in CAPIBM v1beta2
219218
return autoConvert_v1beta2_IBMPowerVSImageStatus_To_v1beta1_IBMPowerVSImageStatus(in, out, s)
220219
}

api/v1beta2/conditions_consts.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ const (
150150

151151
// ImageReconciliationFailedReason used when an error occurs during VPC Custom Image reconciliation.
152152
ImageReconciliationFailedReason = "ImageReconciliationFailed"
153+
154+
// ImageQueuedReason used when the image import is failed.
155+
ImageQueuedReason = "ImageQueued"
153156
)
154157

155158
const (
@@ -161,9 +164,6 @@ const (
161164

162165
// IBMPowerVSImageDeletingV1Beta2Reason surfaces when the image controller by IBMPowerVSImage is deleting.
163166
IBMPowerVSImageDeletingV1Beta2Reason = clusterv1beta1.DeletingV1Beta2Reason
164-
165-
// IBMPowerVSMachineImageDeletingV1Beta2Reason surfaces when the image controller by IBMPowerVSImage is deleting.
166-
IBMPowerVSMachineImageDeletingV1Beta2Reason = clusterv1beta1.DeletingV1Beta2Reason
167167
)
168168

169169
const (
@@ -360,19 +360,19 @@ const (
360360
COSInstanceDeletingV1Beta2Reason = clusterv1beta1.DeletingV1Beta2Reason
361361
)
362362

363-
// IBMPowerVSCluster's Ready condition and corresponding reasons that will be used in v1Beta2 API version.
363+
// IBMPowerVSImage's Ready condition and corresponding reasons that will be used in v1Beta2 API version.
364364
const (
365-
// IBMPowerVSClusterReadyV1Beta2Condition is true if the IBMPowerVSCluster's deletionTimestamp is not set, IBMPowerVSCluster's
365+
// IBMPowerVSImageReadyV1Beta2Condition is true if the IBMPowerVSImage's deletionTimestamp is not set, IBMPowerVSImage's
366366
// FailureDomainsReady, VCenterAvailable and ClusterModulesReady conditions are true.
367367
IBMPowerVSImageReadyV1Beta2Condition = clusterv1beta1.ReadyV1Beta2Condition
368368

369-
// IBMPowerVSClusterReadyV1Beta2Reason surfaces when the IBMPowerVSCluster readiness criteria is met.
369+
// IBMPowerVSImageReadyV1Beta2Reason surfaces when the IBMPowerVSImage readiness criteria is met.
370370
IBMPowerVSImageReadyV1Beta2Reason = clusterv1beta1.ReadyV1Beta2Reason
371371

372-
// IBMPowerVSClusterNotReadyV1Beta2Reason surfaces when the IBMPowerVSCluster readiness criteria is not met.
372+
// IBMPowerVSImageNotReadyV1Beta2Reason surfaces when the IBMPowerVSImage readiness criteria is not met.
373373
IBMPowerVSImageNotReadyV1Beta2Reason = clusterv1beta1.NotReadyV1Beta2Reason
374374

375-
// IBMPowerVSClusterReadyUnknownV1Beta2Reason surfaces when at least one of the IBMPowerVSCluster readiness criteria is unknown
376-
// and none of the IBMPowerVSCluster readiness criteria is met.
375+
// IBMPowerVSImageReadyUnknownV1Beta2Reason surfaces when at least one of the IBMPowerVSImage readiness criteria is unknown
376+
// and none of the IBMPowerVSImage readiness criteria is met.
377377
IBMPowerVSImageReadyUnknownV1Beta2Reason = clusterv1beta1.ReadyUnknownV1Beta2Reason
378378
)

cloud/scope/powervs_image.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333

3434
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
35-
infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
3635
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
3736
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/resourcecontroller"
3837
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
@@ -170,12 +169,12 @@ func (i *PowerVSImageScope) CreateImageCOSBucket(ctx context.Context) (*models.I
170169
record.Warnf(i.IBMPowerVSImage, "FailedRetrieveImage", "Failed to retrieve image %q", m.Name)
171170
return nil, nil, err
172171
} else if imageReply != nil {
173-
log.Info("Image already exists")
172+
log.Info("Image already exists", "imageName", m.Name)
174173
return imageReply, nil, nil
175174
}
176175

177176
if lastJob, _ := i.GetImportJob(); lastJob != nil {
178-
if *lastJob.Status.State != string(infrav1beta2.PowerVSImageStateCompleted) && *lastJob.Status.State != string(infrav1beta2.PowerVSImageStateFailed) {
177+
if *lastJob.Status.State != string(infrav1.PowerVSImageStateCompleted) && *lastJob.Status.State != string(infrav1.PowerVSImageStateFailed) {
179178
log.Info("Previous import job not yet finished", "state", *lastJob.Status.State)
180179
return nil, nil, nil
181180
}
@@ -196,7 +195,7 @@ func (i *PowerVSImageScope) CreateImageCOSBucket(ctx context.Context) (*models.I
196195
record.Warnf(i.IBMPowerVSImage, "FailedCreateImageImportJob", "Failed image import job creation - %v", err)
197196
return nil, nil, err
198197
}
199-
log.Info("New import job request created")
198+
log.Info("New import job request created", "jobID", *jobRef.ID)
200199
record.Eventf(i.IBMPowerVSImage, "SuccessfulCreateImageImportJob", "Created image import job %q", *jobRef.ID)
201200
return nil, jobRef, nil
202201
}

controllers/ibmpowervsimage_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (r *IBMPowerVSImageReconciler) reconcile(ctx context.Context, cluster *infr
151151
if jobID := imageScope.GetJobID(); jobID != "" {
152152
job, err := imageScope.IBMPowerVSClient.GetJob(jobID)
153153
if err != nil {
154-
log.Info("Unable to get job details")
154+
log.Info("Unable to get job details", "jobID", jobID)
155155
return ctrl.Result{RequeueAfter: 2 * time.Minute}, err
156156
}
157157

@@ -181,7 +181,7 @@ func (r *IBMPowerVSImageReconciler) reconcile(ctx context.Context, cluster *infr
181181
v1beta2conditions.Set(imageScope.IBMPowerVSImage, metav1.Condition{
182182
Type: infrav1.IBMPowerVSImageReadyV1Beta2Condition,
183183
Status: metav1.ConditionFalse,
184-
Reason: infrav1.ImageNotReadyReason,
184+
Reason: infrav1.ImageQueuedReason,
185185
})
186186
return ctrl.Result{RequeueAfter: 2 * time.Minute}, nil
187187
default:
@@ -214,7 +214,7 @@ func reconcileImage(ctx context.Context, img *models.ImageReference, imageScope
214214
if img != nil {
215215
image, err := imageScope.IBMPowerVSClient.GetImage(*img.ImageID)
216216
if err != nil {
217-
log.Info("Unable to get image details")
217+
log.Info("Unable to get image details", "imageID", *img.ImageID)
218218
return ctrl.Result{}, err
219219
}
220220

@@ -258,7 +258,7 @@ func reconcileImage(ctx context.Context, img *models.ImageReference, imageScope
258258

259259
// Requeue after 1 minute if image is not ready to update status of the image properly.
260260
if !imageScope.IsReady() {
261-
log.Info("Image is not yet ready")
261+
log.Info("Image is not yet ready, requeue", "state", imageScope.GetImageState())
262262
return ctrl.Result{RequeueAfter: 1 * time.Minute}, nil
263263
}
264264

0 commit comments

Comments
 (0)