Merge pull request #5089 from AndiDog/s3-bucket-ready-after-unready

k8s-ci-robot · web-flow · commit f6a414123da6 · 2024-09-06T18:12:04.000+01:00
🐛 Mark `S3BucketCreated` condition ready after successful reconciliation
diff --git a/controllers/awscluster_controller.go b/controllers/awscluster_controller.go
@@ -358,6 +358,7 @@ func (r *AWSClusterReconciler) reconcileNormal(clusterScope *scope.ClusterScope)
 		conditions.MarkFalse(awsCluster, infrav1.S3BucketReadyCondition, infrav1.S3BucketFailedReason, clusterv1.ConditionSeverityError, err.Error())
 		return reconcile.Result{}, errors.Wrapf(err, "failed to reconcile S3 Bucket for AWSCluster %s/%s", awsCluster.Namespace, awsCluster.Name)
 	}
+	conditions.MarkTrue(awsCluster, infrav1.S3BucketReadyCondition)
 
 	for _, subnet := range clusterScope.Subnets().FilterPrivate() {
 		found := false

Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,7 @@ func (r AWSClusterReconciler) reconcileNormal(clusterScope scope.ClusterScope)`
`358`	`358`	`conditions.MarkFalse(awsCluster, infrav1.S3BucketReadyCondition, infrav1.S3BucketFailedReason, clusterv1.ConditionSeverityError, err.Error())`
`359`	`359`	`return reconcile.Result{}, errors.Wrapf(err, "failed to reconcile S3 Bucket for AWSCluster %s/%s", awsCluster.Namespace, awsCluster.Name)`
`360`	`360`	`}`
	`361`	`+ conditions.MarkTrue(awsCluster, infrav1.S3BucketReadyCondition)`
`361`	`362`
`362`	`363`	`for _, subnet := range clusterScope.Subnets().FilterPrivate() {`
`363`	`364`	`found := false`