ARO - lint-fixes

Author: marek-veber

exp/api/controlplane/v1beta2/arocontrolplane_types.go

@@ -1,11 +1,11 @@
 /*
-Copyright 2023 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,7 +19,6 @@ package v1beta2
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
@@ -124,7 +123,7 @@ type AROPlatformProfileControlPlane struct {
 	ResourceGroup string `json:"resourceGroup,omitempty"`
 
 	// 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.
-	ResourceGroupRef string `json:"resourceGroup,omitempty"`
+	ResourceGroupRef string `json:"resourceGroupRef,omitempty"`
 
 	// Azure subnet id
 	Subnet string `json:"subnet,omitempty"`
@@ -142,6 +141,7 @@ type AROPlatformProfileControlPlane struct {
 	ManagedIdentities ManagedIdentities `json:"managedIdentities,omitempty"`
 }
 
+// ManagedIdentities represents managed identities for the Azure platform configuration.
 type ManagedIdentities struct {
 	// CreateAROHCPManagedIdentities is used to create the required ARO-HCP managed identities if not provided.
 	// It will create UserAssignedIdentity CR for each required managed identity. Default is false.
@@ -157,12 +157,13 @@ type ManagedIdentities struct {
 	ServiceManagedIdentity string `json:"serviceManagedIdentity,omitempty"`
 }
 
+// ControlPlaneOperators represents managed identities for the ControlPlane.
 type ControlPlaneOperators struct {
 	// ControlPlaneManagedIdentities "control-plane" Microsoft.ManagedIdentity/userAssignedIdentities
 	ControlPlaneManagedIdentities string `json:"controlPlaneOperatorsManagedIdentities,omitempty"`
 
-	// ClusterApiAzureManagedIdentities "cluster-api-azure" Microsoft.ManagedIdentity/userAssignedIdentities
-	ClusterApiAzureManagedIdentities string `json:"clusterApiAzureManagedIdentities,omitempty"`
+	// ClusterAPIAzureManagedIdentities "cluster-api-azure" Microsoft.ManagedIdentity/userAssignedIdentities
+	ClusterAPIAzureManagedIdentities string `json:"clusterApiAzureManagedIdentities,omitempty"`
 
 	// CloudControllerManagerManagedIdentities "cloud-controller-manager" Microsoft.ManagedIdentity/userAssignedIdentities
 	CloudControllerManagerManagedIdentities string `json:"cloudControllerManager,omitempty"`
@@ -186,6 +187,7 @@ type ControlPlaneOperators struct {
 	KmsManagedIdentities string `json:"kmsManagedIdentities,omitempty"`
 }
 
+// DataPlaneOperators represents managed identities for the DataPlane.
 type DataPlaneOperators struct {
 	// DiskCsiDriverManagedIdentities "disk-csi-driver" Microsoft.ManagedIdentity/userAssignedIdentities
 	DiskCsiDriverManagedIdentities string `json:"diskCsiDriverManagedIdentities,omitempty"`
@@ -258,8 +260,8 @@ type AROControlPlaneStatus struct {
 	// ConsoleURL is the url for the openshift console.
 	ConsoleURL string `json:"consoleURL,omitempty"`
 
-	// ApiURL is the url for the ARO-HCP openshift cluster api endPoint.
-	ApiURL string `json:"apiURL,omitempty"`
+	// APIURL is the url for the ARO-HCP openshift cluster api endPoint.
+	APIURL string `json:"apiURL,omitempty"`
 
 	// ARO-HCP OpenShift semantic version, for example "4.20.0".
 	Version string `json:"version"`

exp/api/v1beta2/arocluster_types.go

@@ -1,11 +1,11 @@
 /*
-Copyright 2023 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,6 @@ package v1beta2
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
@@ -63,6 +62,7 @@ type AROCluster struct {
 	Status AROClusterStatus `json:"status,omitempty"`
 }
 
+// AROClusterKind is the kind for AROCluster.
 const AROClusterKind = "AROCluster"
 
 // +kubebuilder:object:root=true

exp/api/v1beta2/aromachinepool_types.go

@@ -1,11 +1,11 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,9 +19,9 @@ package v1beta2
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 // AROMachinePoolSpec defines the desired state of AROMachinePool.
@@ -175,6 +175,7 @@ type AROMachinePool struct {
 	Status AROMachinePoolStatus `json:"status,omitempty"`
 }
 
+// AROMachinePoolKind is the kind for AROMachinePool.
 const AROMachinePoolKind = "AROMachinePool"
 
 // +kubebuilder:object:root=true

exp/controllers/arocluster_controller.go

@@ -20,9 +20,6 @@ import (
 	"context"
 	"fmt"
 
-	infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers"
-	infrav2exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta2"
-	"sigs.k8s.io/cluster-api-provider-azure/util/tele"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/predicates"
@@ -31,6 +28,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+
+	infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers"
+	infrav2exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta2"
+	"sigs.k8s.io/cluster-api-provider-azure/util/tele"
 )
 
 // AROClusterReconciler reconciles a AROCluster object.

exp/controllers/arocontrolplane_controller.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/cluster-api-provider-azure/exp/api/controlplane/v1beta2"
 	"sigs.k8s.io/cluster-api/util/predicates"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"