tmp

Author: PanSpagetka

exp/controllers/rosamachinepool_controller.go

@@ -202,10 +202,28 @@ func (r *ROSAMachinePoolReconciler) reconcileNormal(ctx context.Context,
 
 	failureMessage, err := validateMachinePoolSpec(machinePoolScope)
 	if err != nil {
+
 		return ctrl.Result{}, fmt.Errorf("failed to validate ROSAMachinePool.spec: %w", err)
 	}
 	if failureMessage != nil {
-		machinePoolScope.RosaMachinePool.Status.FailureMessage = failureMessage
+		// fmt.Println("FAIL", machinePoolScope.RosaMachinePool.Name)
+
+		// machinePoolScope.RosaMachinePool.Status.FailureMessage = failureMessage
+		// conditions.MarkFalse(machinePoolScope.RosaMachinePool,
+		// 	expinfrav1.RosaMachinePoolReadyCondition,
+		// 	expinfrav1.RosaMachinePoolReconciliationFailedReason,
+		// 	clusterv1.ConditionSeverityError,
+		// 	"failed to create ROSAMachinePool: %s", *failureMessage)
+		// machinePoolScope.Close()
+		// annotations.AddAnnotations(machinePoolScope.RosaMachinePool, map[string]string{
+		// 	clusterv1.ReplicasManagedByAnnotation: "rosa",
+		// })
+		// if err := machinePoolScope.PatchRosaMachinePoolObject(ctx); err != nil {
+		// 	fmt.Println("ERRRRR PatchRosaMachinePoolObject", err.Error())
+		// 	return ctrl.Result{}, err
+		// }
+		// machinePoolScope.Patch(ctx, machinePoolScope.RosaMachinePool)
+		// r.Status().Update(ctx, machinePoolScope.RosaMachinePool)
 		// dont' requeue because input is invalid and manual intervention is needed.
 		return ctrl.Result{}, nil
 	}

exp/controllers/rosamachinepool_controller_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 	"testing"
 	"time"
 
@@ -174,12 +175,18 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "rosa-machinepool",
 				Namespace: ns.Name,
+				UID:       "rosa-machinepool-1",
 			},
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "ROSAMachinePool",
 				APIVersion: expinfrav1.GroupVersion.String(),
 			},
-			Spec: expinfrav1.RosaMachinePoolSpec{},
+			Spec: expinfrav1.RosaMachinePoolSpec{
+				NodePoolName: "test-nodepool",
+				Version:      "4.14.5",
+				Subnet:       "subnet-id",
+				InstanceType: "m5.large",
+			},
 		}
 
 		ownerMachinePool = &expclusterv1.MachinePool{
@@ -220,7 +227,7 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 			},
 		}
 
-		objects = []client.Object{secret, ownerCluster, ownerMachinePool}
+		objects = []client.Object{secret, ownerCluster, ownerMachinePool, rosaMachinePool}
 
 		for _, obj := range objects {
 			createObject(g, obj, ns.Name)
@@ -267,8 +274,16 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 		req.NamespacedName = types.NamespacedName{Name: "rosa-machinepool", Namespace: ns.Name}
 
 		result, err := r.Reconcile(ctx, req)
+		m := &expinfrav1.ROSAMachinePool{}
+		// key := client.ObjectKey{Name: ownerMachinePool.Name, Namespace: ns.Name}
+		key := client.ObjectKey{Name: rosaMachinePool.Name, Namespace: ns.Name}
+
+		c.Get(ctx, key, m)
+		fmt.Println("Aaaaaaaaaaaaaaaaa", m.Status, m.Annotations, m.GetAnnotations())
+		// g.Expect(m.Annotations).To(Equal(map[string]string{"cluster.x-k8s.io/replicas-managed-by": "rosa"}))
 
 		g.Expect(err).ToNot(HaveOccurred())
+
 		g.Expect(result).To(Equal(ctrl.Result{}))
 	})
 

exp/controllers/suite_test.go

@@ -21,12 +21,14 @@ import (
 	"path"
 	"testing"
 
+	corev1 "k8s.io/api/core/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	// +kubebuilder:scaffold:imports
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	rosacontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/rosa/api/v1beta2"
 	expinfrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/test/helpers"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -52,6 +54,8 @@ func setup() {
 	utilruntime.Must(clusterv1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(expinfrav1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(expclusterv1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(corev1.AddToScheme(scheme.Scheme))
+	utilruntime.Must(rosacontrolplanev1.AddToScheme(scheme.Scheme))
 	testEnvConfig := helpers.NewTestEnvironmentConfiguration([]string{
 		path.Join("config", "crd", "bases"),
 	},
@@ -76,6 +80,12 @@ func setup() {
 	if err := (&expinfrav1.AWSManagedMachinePool{}).SetupWebhookWithManager(testEnv); err != nil {
 		panic(fmt.Sprintf("Unable to setup AWSManagedMachinePool webhook: %v", err))
 	}
+	if err := (&expinfrav1.ROSAMachinePool{}).SetupWebhookWithManager(testEnv); err != nil {
+		panic(fmt.Sprintf("Unable to setup ROSAMachinePool webhook: %v", err))
+	}
+	if err := (&rosacontrolplanev1.ROSAControlPlane{}).SetupWebhookWithManager(testEnv); err != nil {
+		panic(fmt.Sprintf("Unable to setup ROSAMachinePool webhook: %v", err))
+	}
 	go func() {
 		fmt.Println("Starting the manager")
 		if err := testEnv.StartManager(ctx); err != nil {

pkg/cloud/scope/rosamachinepool.go

@@ -227,6 +227,13 @@ func (s *RosaMachinePoolScope) PatchCAPIMachinePoolObject(ctx context.Context) e
 	)
 }
 
+func (s *RosaMachinePoolScope) PatchRosaMachinePoolObject(ctx context.Context) error {
+	return s.patchHelper.Patch(
+		ctx,
+		s.RosaMachinePool,
+	)
+}
+
 // Close closes the current scope persisting the control plane configuration and status.
 func (s *RosaMachinePoolScope) Close() error {
 	return s.PatchObject()