Fix linting and controllers references:

Clean up missed from the reorg.

Signed-off-by: Jacob Weinstock <[email protected]>

Author: jacobweinstock

.golangci.yml

@@ -84,7 +84,7 @@ issues:
       source: "^// \\+kubebuilder:"
     - linters:
         - lll
-      path: "controllers/(.+)_test.go"
+      path: "controller/*/(.+)_test.go"
   exclude-files:
     - "zz_generated.*\\.go$"
     - ".*conversion.*\\.go$"

Makefile

@@ -217,7 +217,7 @@ generate-manifests: tools ## Generate manifests e.g. CRD, RBAC etc.
 		output:webhook:dir=$(WEBHOOK_ROOT) \
 		webhook
 	$(CONTROLLER_GEN) \
-		paths=./controllers/... \
+		paths=./controller/... \
 		output:rbac:dir=$(RBAC_ROOT) \
 		rbac:roleName=manager-role
 

controller/cluster/tinkerbellcluster.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package controller contains Cluster API controllers for Tinkerbell.
+// Package cluster contains Cluster API controller for the TinkerbellCluster CR.
 package cluster
 
 import (

controller/cluster/tinkerbellcluster_test.go

@@ -111,9 +111,9 @@ type testOptions struct {
 func validHardware(name, uuid, ip string, options ...testOptions) *tinkv1.Hardware {
 	hw := &tinkv1.Hardware{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        name,
-			Namespace:   clusterNamespace,
-			UID:         types.UID(uuid),
+			Name:      name,
+			Namespace: clusterNamespace,
+			UID:       types.UID(uuid),
 		},
 		Spec: tinkv1.HardwareSpec{
 			Disks: []tinkv1.Disk{

controller/machine/hardware.go

@@ -5,7 +5,6 @@ import (
 	"sort"
 	"strings"
 
-	infrastructurev1 "github.com/tinkerbell/cluster-api-provider-tinkerbell/api/v1beta1"
 	tinkv1 "github.com/tinkerbell/tink/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -14,6 +13,8 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	infrastructurev1 "github.com/tinkerbell/cluster-api-provider-tinkerbell/api/v1beta1"
 )
 
 const (
@@ -45,6 +46,7 @@ var (
 	ErrHardwareMissingDiskConfiguration = fmt.Errorf("disk configuration is required")
 )
 
+// HardwareIP returns the IP address of the first network interface of the given hardware.
 func HardwareIP(hardware *tinkv1.Hardware) (string, error) {
 	if hardware == nil {
 		return "", ErrHardwareIsNil

controller/machine/template.go

@@ -8,11 +8,12 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/tinkerbell/cluster-api-provider-tinkerbell/internal/templates"
 	tinkv1 "github.com/tinkerbell/tink/api/v1alpha1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/tinkerbell/cluster-api-provider-tinkerbell/internal/templates"
 )
 
 func (scope *machineReconcileScope) templateExists() (bool, error) {
@@ -188,6 +189,7 @@ func imageURL(imageFormat, baseRegistry, osDistro, osVersion, kubernetesVersion
 		OSVersion         string
 		KubernetesVersion string
 	}
+
 	imageParams := image{
 		BaseRegistry:      baseRegistry,
 		OSDistro:          strings.ToLower(osDistro),

controller/machine/tinkerbellmachine.go

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package machine contains Cluster API controller for the TinkerbellMachine CR.
 package machine
 
 import (

controller/machine/tinkerbellmachine_test.go

@@ -113,6 +113,7 @@ func validCluster(name, namespace string) *clusterv1.Cluster {
 	}
 }
 
+//nolint:unparam
 func validTinkerbellCluster(name, namespace string) *infrastructurev1.TinkerbellCluster {
 	tinkCluster := &infrastructurev1.TinkerbellCluster{
 		ObjectMeta: metav1.ObjectMeta{
@@ -178,9 +179,9 @@ func validSecret(name, namespace string) *corev1.Secret {
 func validHardware(name, uuid, ip string, options ...testOptions) *tinkv1.Hardware {
 	hw := &tinkv1.Hardware{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        name,
-			Namespace:   clusterNamespace,
-			UID:         types.UID(uuid),
+			Name:      name,
+			Namespace: clusterNamespace,
+			UID:       types.UID(uuid),
 		},
 		Spec: tinkv1.HardwareSpec{
 			Disks: []tinkv1.Disk{

controller/machine/workflow.go

@@ -9,10 +9,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-var (
-	// errWorkflowFailed is the error returned when the workflow fails.
-	errWorkflowFailed = fmt.Errorf("workflow failed")
-)
+// errWorkflowFailed is the error returned when the workflow fails.
+var errWorkflowFailed = fmt.Errorf("workflow failed")
 
 // lastActionStarted returns the state of the final action in a hardware's workflow or an error if the workflow
 // has not reached the final action.

tilt-provider.json

@@ -3,7 +3,7 @@
     "config": {
         "image": "ghcr.io/tinkerbell/cluster-api-provider-tinkerbell:dev",
         "live_reload_deps": [
-            "main.go", "go.mod", "go.sum", "api", "controllers", "tink", "internal"
+            "main.go", "go.mod", "go.sum", "api", "controller", "tink", "internal"
         ],
         "label": "tinkerbell",
         "manager_name": "capt-controller-manager"