fixed rosamachinepools rbac

- fixed docs

Author: muraee

config/rbac/role.yaml

@@ -401,7 +401,7 @@ rules:
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - rosamachinenepools
+  - rosamachinepools
   verbs:
   - delete
   - get
@@ -412,7 +412,7 @@ rules:
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
   resources:
-  - rosamachinenepools/status
+  - rosamachinepools/status
   verbs:
   - get
   - patch

docs/book/src/topics/rosa/creating-a-cluster.md

@@ -11,7 +11,7 @@ CAPA controller requires an API token in order to be able to provision ROSA clus
       --from-literal=ocmToken='eyJhbGciOiJIUzI1NiIsI....' \
       --from-literal=ocmApiUrl='https://api.openshift.com' 
     ```
-  
+
     Alternatively, you can edit CAPA controller deployment to provide the credentials:
     ```shell
     kubectl edit deployment -n capa-system capa-controller-manager
@@ -36,7 +36,7 @@ Once Step 3 is done, you will be ready to proceed with creating a ROSA cluster u
 
 1. Prepare the environment:
     ```bash
-    export OPENSHIFT_VERSION="openshift-v4.14.5"
+    export OPENSHIFT_VERSION="4.14.5"
     export CLUSTER_NAME="capi-rosa-quickstart"
     export AWS_REGION="us-west-2"
     export AWS_AVAILABILITY_ZONE="us-west-2a"

exp/controllers/rosamachinepool_controller.go

@@ -69,8 +69,8 @@ func (r *ROSAMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ct
 // +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=machinepools;machinepools/status,verbs=get;list;watch;patch
 // +kubebuilder:rbac:groups=core,resources=events,verbs=get;list;watch;create;patch
 // +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=rosacontrolplanes;rosacontrolplanes/status,verbs=get;list;watch
-// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=rosamachinenepools,verbs=get;list;watch;update;patch;delete
-// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=rosamachinenepools/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=rosamachinepools,verbs=get;list;watch;update;patch;delete
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=rosamachinepools/status,verbs=get;update;patch
 
 // Reconcile reconciles RosaMachinePool.
 func (r *ROSAMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {

templates/cluster-template-rosa-machinepool.yaml

@@ -67,15 +67,16 @@ spec:
       infrastructureRef:
         name: "${CLUSTER_NAME}-pool-0"
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-        kind: RosaMachinePool
+        kind: ROSAMachinePool
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-kind: RosaMachinePool
+kind: ROSAMachinePool
 metadata:
   name: "${CLUSTER_NAME}-pool-0"
 spec:
   nodePoolName: "nodepool-0"
   instanceType: "m5.xlarge"
   subnet: "${PRIVATE_SUBNET_ID}"
+  version: "${OPENSHIFT_VERSION}"