fix

Author: marek-veber

config/crd/bases/infrastructure.cluster.x-k8s.io_arocontrolplanes.yaml

@@ -60,7 +60,7 @@ spec:
                 type: object
               aroClusterName:
                 description: |-
-                  Cluster name must beDiskStorageAccountType valid DNS-1035 label, so it must consist of lower case alphanumeric
+                  Cluster name must be valid DNS-1035 label, so it must consist of lower case alphanumeric
                   characters or '-', start with an alphabetic character, end with an alphanumeric character
                   and have a max length of 54 characters.
                 maxLength: 54
@@ -188,7 +188,7 @@ spec:
                               Microsoft.ManagedIdentity/userAssignedIdentities
                             type: string
                           clusterApiAzureManagedIdentities:
-                            description: ClusterApiAzureManagedIdentities "cluster-api-azure"
+                            description: ClusterAPIAzureManagedIdentities "cluster-api-azure"
                               Microsoft.ManagedIdentity/userAssignedIdentities
                             type: string
                           controlPlaneOperatorsManagedIdentities:
@@ -247,6 +247,10 @@ spec:
                       egress to the Internet. Allowed value is loadBalancer
                     type: string
                   resourceGroup:
+                    description: Resource group name where the ARO-hcp will be attached
+                      to it.
+                    type: string
+                  resourceGroupRef:
                     description: ResourceGroup Ref name that is used to create the
                       ResourceGroup CR. The ResourceGroupRef must be in the same namespace
                       as the AROControlPlane and cannot be set with ResourceGroup.
@@ -297,7 +301,7 @@ spec:
             description: AROControlPlaneStatus defines the observed state of AROControlPlane.
             properties:
               apiURL:
-                description: ApiURL is the url for the ARO-HCP openshift cluster api
+                description: APIURL is the url for the ARO-HCP openshift cluster api
                   endPoint.
                 type: string
               availableUpgrades:

config/crd/patches/capicontract_in_aroclusters.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: aroclusters.infrastructure.cluster.x-k8s.io
   labels:
-    cluster.x-k8s.io/v1beta1: v1beta1
+    cluster.x-k8s.io/v1beta2: v1beta2

config/crd/patches/capicontract_in_arocontrolplanes.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: arocontrolplanes.controlplane.cluster.x-k8s.io
   labels:
-    cluster.x-k8s.io/v1beta1: v1beta1
+    cluster.x-k8s.io/v1beta2: v1beta2

config/crd/patches/capicontract_in_aromachinepools.yaml

@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
 metadata:
   name: aromachinepools.infrastructure.cluster.x-k8s.io
   labels:
-    cluster.x-k8s.io/v1beta1: v1beta1
+    cluster.x-k8s.io/v1beta2: v1beta2

exp/api/v1beta2/aromachinepool_types.go

@@ -175,8 +175,13 @@ type AROMachinePool struct {
 	Status AROMachinePoolStatus `json:"status,omitempty"`
 }
 
-// AROMachinePoolKind is the kind for AROMachinePool.
-const AROMachinePoolKind = "AROMachinePool"
+const (
+	// AROMachinePoolKind is the kind for AROMachinePool.
+	AROMachinePoolKind = "AROMachinePool"
+
+	// AROMachinePoolFinalizer is the finalizer added to AROControlPlanes.
+	AROMachinePoolFinalizer = "aromachinepool/finalizer"
+)
 
 // +kubebuilder:object:root=true
 

exp/controllers/arocluster_controller.go

@@ -72,9 +72,9 @@ func (r *AROClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Ma
 	return nil
 }
 
-//+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters/finalizers,verbs=update
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters/finalizers,verbs=update
 
 // Reconcile reconciles an AROCluster.
 func (r *AROClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, resultErr error) {
@@ -86,8 +86,9 @@ func (r *AROClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	)
 	defer done()
 
-	log = log.WithValues("namespace", req.Namespace, "azureCluster", req.Name)
+	log = log.WithValues("namespace", req.Namespace, "AROCluster", req.Name)
 
+	// Fetch the AROCluster instance
 	aroCluster := &infrav2exp.AROCluster{}
 	err := r.Get(ctx, req.NamespacedName, aroCluster)
 	if err != nil {

main.go

@@ -61,7 +61,9 @@ import (
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-azure/azure"
 	"sigs.k8s.io/cluster-api-provider-azure/controllers"
+	cplanev1beta2exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/controlplane/v1beta2"
 	infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1"
+	infrav1beta2exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta2"
 	infrav1controllersexp "sigs.k8s.io/cluster-api-provider-azure/exp/controllers"
 	"sigs.k8s.io/cluster-api-provider-azure/feature"
 	"sigs.k8s.io/cluster-api-provider-azure/pkg/coalescing"
@@ -79,6 +81,8 @@ func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 	_ = infrav1.AddToScheme(scheme)
 	_ = infrav1exp.AddToScheme(scheme)
+	_ = cplanev1beta2exp.AddToScheme(scheme)
+	_ = infrav1beta2exp.AddToScheme(scheme)
 	_ = clusterv1.AddToScheme(scheme)
 	_ = expv1.AddToScheme(scheme)
 	_ = kubeadmv1.AddToScheme(scheme)
@@ -611,23 +615,23 @@ func registerControllers(ctx context.Context, mgr manager.Manager) {
 			Client:           mgr.GetClient(),
 			WatchFilterValue: watchFilterValue,
 		}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureClusterConcurrency}); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "AroCluster")
+			setupLog.Error(err, "unable to create controller", "controller", "AROCluster")
 			os.Exit(1)
 		}
 
 		if err := (&infrav1controllersexp.AROControlPlaneReconciler{
 			Client:           mgr.GetClient(),
 			WatchFilterValue: watchFilterValue,
 		}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureClusterConcurrency}); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "AroControlPlane")
+			setupLog.Error(err, "unable to create controller", "controller", "AROControlPlane")
 			os.Exit(1)
 		}
 
 		if err := (&infrav1controllersexp.AroMachinePoolReconciler{
 			Client:           mgr.GetClient(),
 			WatchFilterValue: watchFilterValue,
 		}).SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: azureMachinePoolConcurrency}); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "AroMachinePool")
+			setupLog.Error(err, "unable to create controller", "controller", "AROMachinePool")
 			os.Exit(1)
 		}
 	}