Skip to content

Commit c0d0d2a

Browse files
committed
tmp2
1 parent 4475c6e commit c0d0d2a

File tree

8 files changed

+49
-502
lines changed

8 files changed

+49
-502
lines changed

controllers/suite_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727

2828
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2929
"sigs.k8s.io/cluster-api-provider-aws/v2/test/helpers"
30-
3130
// +kubebuilder:scaffold:imports
3231
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3332
kubeadmv1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"

exp/api/v1beta2/rosaroleconfig_types.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ type ROSARoleConfigList struct {
153153

154154
const (
155155
// RosaRoleConfigReadyCondition condition reports on the successful reconciliation of RosaRoleConfig.
156-
RosaRoleConfigReadyCondition clusterv1.ConditionType = "RosaRoleConfigReady"
156+
RosaRoleConfigReadyCondition = "RosaRoleConfigReady"
157157

158158
// RosaRoleConfigDeletionFailedReason used to report failures while deleting RosaRoleConfig.
159159
RosaRoleConfigDeletionFailedReason = "DeletionFailed"
@@ -163,18 +163,21 @@ const (
163163

164164
// RosaRoleConfigDeletionStarted used to indicate that the deletion of RosaRoleConfig has started.
165165
RosaRoleConfigDeletionStarted = "DeletionStarted"
166+
167+
// RosaRoleConfigCreatedReason used to indicate that the RosaRoleConfig has been created.
168+
RosaRoleConfigCreatedReason = "Created"
166169
)
167170

171+
// SetConditions sets the conditions of the ROSARoleConfig.
172+
func (r *ROSARoleConfig) SetConditions(conditions clusterv1.Conditions) {
173+
r.Status.Conditions = conditions
174+
}
175+
168176
// GetConditions returns the observations of the operational state of the RosaNetwork resource.
169177
func (r *ROSARoleConfig) GetConditions() clusterv1.Conditions {
170178
return r.Status.Conditions
171179
}
172180

173-
// SetConditions sets the underlying service state of the RosaRoleConfig to the predescribed clusterv1.Conditions.
174-
func (r *ROSARoleConfig) SetConditions(conditions clusterv1.Conditions) {
175-
r.Status.Conditions = conditions
176-
}
177-
178181
func init() {
179182
SchemeBuilder.Register(&ROSARoleConfig{}, &ROSARoleConfigList{})
180183
}

exp/controllers/rosaroleconfig_controller.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
rosalogging "github.com/openshift/rosa/pkg/logging"
3838
"github.com/openshift/rosa/pkg/ocm"
3939
rosacli "github.com/openshift/rosa/pkg/rosa"
40+
corev1 "k8s.io/api/core/v1"
4041
apierrors "k8s.io/apimachinery/pkg/api/errors"
4142
"k8s.io/apimachinery/pkg/runtime"
4243
"k8s.io/klog/v2"
@@ -164,7 +165,14 @@ func (r *ROSARoleConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reque
164165

165166
if r.rosaRolesConfigReady(scope) {
166167
conditions.MarkTrue(scope.RosaRoleConfig, expinfrav1.RosaRoleConfigReadyCondition)
167-
168+
conditions.Set(scope.RosaRoleConfig,
169+
&clusterv1.Condition{
170+
Type: expinfrav1.RosaRoleConfigReadyCondition,
171+
Status: corev1.ConditionTrue,
172+
Reason: expinfrav1.RosaRoleConfigCreatedReason,
173+
Severity: clusterv1.ConditionSeverityInfo,
174+
Message: "RosaRoleConfig is ready to be used.",
175+
})
168176
}
169177
return ctrl.Result{}, nil
170178
}

0 commit comments

Comments
 (0)