tmp2

Author: PanSpagetka

exp/api/v1beta2/rosaroleconfig_types.go

@@ -153,7 +153,7 @@ type ROSARoleConfigList struct {
 
 const (
 	// RosaRoleConfigReadyCondition condition reports on the successful reconciliation of RosaRoleConfig.
-	RosaRoleConfigReadyCondition clusterv1.ConditionType = "RosaRoleConfigReady"
+	RosaRoleConfigReadyCondition = "RosaRoleConfigReady"
 
 	// RosaRoleConfigDeletionFailedReason used to report failures while deleting RosaRoleConfig.
 	RosaRoleConfigDeletionFailedReason = "DeletionFailed"
@@ -163,18 +163,22 @@ const (
 
 	// RosaRoleConfigDeletionStarted used to indicate that the deletion of RosaRoleConfig has started.
 	RosaRoleConfigDeletionStarted = "DeletionStarted"
+
+	// RosaRoleConfigCreatedReason used to indicate that the RosaRoleConfig has been created.
+	RosaRoleConfigCreatedReason = "Created"
 )
 
+// TODO: SOLVE THIS!
+func (r *ROSARoleConfig) SetConditions(conditions clusterv1.Conditions) {
+	r.Status.Conditions = conditions
+
+}
+
 // GetConditions returns the observations of the operational state of the RosaNetwork resource.
 func (r *ROSARoleConfig) GetConditions() clusterv1.Conditions {
 	return r.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the RosaRoleConfig to the predescribed clusterv1.Conditions.
-func (r *ROSARoleConfig) SetConditions(conditions clusterv1.Conditions) {
-	r.Status.Conditions = conditions
-}
-
 func init() {
 	SchemeBuilder.Register(&ROSARoleConfig{}, &ROSARoleConfigList{})
 }

exp/controllers/rosaroleconfig_controller.go

@@ -37,6 +37,7 @@ import (
 	rosalogging "github.com/openshift/rosa/pkg/logging"
 	"github.com/openshift/rosa/pkg/ocm"
 	rosacli "github.com/openshift/rosa/pkg/rosa"
+	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
@@ -164,6 +165,14 @@ func (r *ROSARoleConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	if r.rosaRolesConfigReady(scope) {
 		conditions.MarkTrue(scope.RosaRoleConfig, expinfrav1.RosaRoleConfigReadyCondition)
+		conditions.Set(scope.RosaRoleConfig,
+			&clusterv1.Condition{
+				Type:     expinfrav1.RosaRoleConfigReadyCondition,
+				Status:   corev1.ConditionTrue,
+				Reason:   expinfrav1.RosaRoleConfigCreatedReason,
+				Severity: clusterv1.ConditionSeverityInfo,
+				Message:  "RosaRoleConfig is ready to be used.",
+			})
 
 	}
 	return ctrl.Result{}, nil

go.mod

@@ -1,8 +1,6 @@
 module sigs.k8s.io/cluster-api-provider-aws/v2
 
-go 1.23
-
-toolchain go1.23.1
+go 1.23.1
 
 // kube-openapi should match the version imported by CAPI.
 replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
@@ -34,7 +32,8 @@ require (
 	github.com/openshift-online/ocm-common v0.0.21
 	github.com/openshift-online/ocm-sdk-go v0.1.465
 	// github.com/openshift/rosa v1.2.54-rc1.0.20250604182244-c38eaa8ff4e2
-	github.com/openshift/rosa v0.0.0-20250528120404-279e4e58d597
+	// github.com/openshift/rosa v0.0.0-20250528120404-279e4e58d597
+	github.com/openshift/rosa v1.2.54
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.1
 	github.com/sergi/go-diff v1.3.1
@@ -223,7 +222,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
-	go.uber.org/mock v0.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
@@ -251,7 +249,7 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-replace github.com/openshift/rosa => ./rosa
+// replace github.com/openshift/rosa => ./rosa
 
 // replace github.com/openshift/rosa => github.com/PanSpagetka/rosa
 // replace github.com/openshift/rosa => github.com/PanSpagetka/rosa v0.0.0-20250528120404-279e4e58d597

go.sum

@@ -467,6 +467,8 @@ github.com/openshift-online/ocm-common v0.0.21 h1:rfp6cPPgVPk/Sm7xAsNFQHaK9Ng1bE
 github.com/openshift-online/ocm-common v0.0.21/go.mod h1:VEkuZp9aqbXtetZ5ycND6QpvhykvTuBF3oPsVM1X3vI=
 github.com/openshift-online/ocm-sdk-go v0.1.465 h1:RZr92sdcAKyLVcL19/RYOn6KVtspDUH1wc3UuO4LgiE=
 github.com/openshift-online/ocm-sdk-go v0.1.465/go.mod h1:EOkylgH0bafd+SlU9YvMrIIxHJw0Hk1EnC7W1VZeW8I=
+github.com/openshift/rosa v1.2.54 h1:BgSixJm/c87HdgiLDfpowPdA0jFiX6e4/KIPjZkeFpw=
+github.com/openshift/rosa v1.2.54/go.mod h1:H+CPk0tEWLop91ILWIbbT4eI+7w0QP2hYARm4rQsg5Q=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
@@ -623,8 +625,6 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
-go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=

main.go

@@ -65,6 +65,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/version"
+
 	// +kubebuilder:scaffold:imports
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"

pkg/cloud/scope/rosaroleconfig.go

@@ -31,7 +31,6 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/throttle"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/patch"
 )
 
@@ -137,10 +136,7 @@ func (s *RosaRoleConfigScope) GetClient() client.Client {
 func (s *RosaRoleConfigScope) PatchObject() error {
 	return s.patchHelper.Patch(
 		context.TODO(),
-		s.RosaRoleConfig,
-		patch.WithOwnedConditions{Conditions: []clusterv1.ConditionType{
-			expinfrav1.RosaRoleConfigReadyCondition,
-		}})
+		s.RosaRoleConfig)
 }
 
 // Close closes the current scope persisting the RosaRoleConfig configuration and status.