chore(ci): Migrate golangci.yaml to v2

jschoone · jschoone · commit 3b25637fe04a · 2025-06-13T22:25:13.000+02:00
fix: Adjust code according to linter

Signed-off-by: Jan Schoone &lt;jan.schoone@uhurutec.com&gt;
diff --git a/.golangci.yaml b/.golangci.yaml
diff --git a/Makefile b/Makefile
@@ -451,7 +451,7 @@ ifeq ($(BUILD_IN_CONTAINER),true)
 else
 	go version
 	golangci-lint version
-	GO111MODULE=on golangci-lint run -v --out-format=colored-line-number
+	GO111MODULE=on golangci-lint run -v --output.text.colors=true
 endif
 
 .PHONY: lint-yaml
diff --git a/api/v1alpha1/resources.go b/api/v1alpha1/resources.go
@@ -17,14 +17,14 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"fmt"
+	"errors"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // ErrNilInput indicates a nil input.
-var ErrNilInput = fmt.Errorf("nil input")
+var ErrNilInput = errors.New("nil input")
 
 // Resource defines the status of a resource.
 type Resource struct {
diff --git a/internal/controller/clusteraddon_controller.go b/internal/controller/clusteraddon_controller.go
@@ -161,8 +161,8 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 
 	// usually this is only nil in unit tests
 	if restConfig != nil {
-		restConfig.QPS = r.RestConfigSettings.QPS
-		restConfig.Burst = r.RestConfigSettings.Burst
+		restConfig.QPS = r.QPS
+		restConfig.Burst = r.Burst
 
 		clientSet, err := kubernetes.NewForConfig(restConfig)
 		if err != nil {
@@ -860,52 +860,51 @@ check:
 
 			in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
 			goto check
-		} else {
-			// Delete part
-			logger.V(1).Info("starting to template helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
-			helmTemplate, err := helmTemplateNewClusterStack(in, stage.Name)
-			if err != nil {
-				conditions.MarkFalse(
-					in.clusterAddon,
-					csov1alpha1.HelmChartTemplatedCondition,
-					csov1alpha1.TemplateNewClusterStackFailedReason,
-					clusterv1.ConditionSeverityError,
-					"failed to template new helm chart: %s", err.Error(),
-				)
+		}
+		// Delete part
+		logger.V(1).Info("starting to template helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
+		helmTemplate, err := helmTemplateNewClusterStack(in, stage.Name)
+		if err != nil {
+			conditions.MarkFalse(
+				in.clusterAddon,
+				csov1alpha1.HelmChartTemplatedCondition,
+				csov1alpha1.TemplateNewClusterStackFailedReason,
+				clusterv1.ConditionSeverityError,
+				"failed to template new helm chart: %s", err.Error(),
+			)
 
-				return false, nil
-			}
-			logger.V(1).Info("finished templating helm chart and starting to delete helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
+			return false, nil
+		}
+		logger.V(1).Info("finished templating helm chart and starting to delete helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 
-			deletedResources, shouldRequeue, err := in.kubeClient.DeleteNewClusterStack(ctx, helmTemplate)
-			if err != nil {
-				conditions.MarkFalse(
-					in.clusterAddon,
-					csov1alpha1.HelmChartDeletedCondition,
-					csov1alpha1.FailedToDeleteObjectsReason,
-					clusterv1.ConditionSeverityInfo,
-					"failed to successfully delete helm chart: %q", stage.Name,
-				)
+		deletedResources, shouldRequeue, err := in.kubeClient.DeleteNewClusterStack(ctx, helmTemplate)
+		if err != nil {
+			conditions.MarkFalse(
+				in.clusterAddon,
+				csov1alpha1.HelmChartDeletedCondition,
+				csov1alpha1.FailedToDeleteObjectsReason,
+				clusterv1.ConditionSeverityInfo,
+				"failed to successfully delete helm chart: %q", stage.Name,
+			)
 
-				return false, fmt.Errorf("failed to delete objects from cluster addon Helm chart: %w", err)
-			}
-			if shouldRequeue {
-				return true, nil
-			}
+			return false, fmt.Errorf("failed to delete objects from cluster addon Helm chart: %w", err)
+		}
+		if shouldRequeue {
+			return true, nil
+		}
 
-			// This is for the current stage objects and will be removed once done.
-			in.clusterAddon.Status.Resources = deletedResources
-			logger.V(1).Info("finished deleting helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
+		// This is for the current stage objects and will be removed once done.
+		in.clusterAddon.Status.Resources = deletedResources
+		logger.V(1).Info("finished deleting helm chart", "clusterStack", in.clusterAddon.Spec.ClusterStack, "name", stage.Name, "hook", in.clusterAddon.Spec.Hook)
 
-			// remove status resource if deleted successfully
-			in.clusterAddon.Status.Resources = make([]*csov1alpha1.Resource, 0)
+		// remove status resource if deleted successfully
+		in.clusterAddon.Status.Resources = make([]*csov1alpha1.Resource, 0)
 
-			// delete the false condition with failed to apply reason
-			conditions.Delete(in.clusterAddon, csov1alpha1.HelmChartDeletedCondition)
+		// delete the false condition with failed to apply reason
+		conditions.Delete(in.clusterAddon, csov1alpha1.HelmChartDeletedCondition)
 
-			in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
-			goto check
-		}
+		in.clusterAddon.SetStagePhase(stage.Name, stage.Action, csov1alpha1.StagePhaseWaitingForPostCondition)
+		goto check
 
 	case csov1alpha1.StagePhaseWaitingForPostCondition:
 		// If WaitForPostCondition is mentioned.
diff --git a/internal/controller/clusterstack_controller.go b/internal/controller/clusterstack_controller.go
@@ -19,6 +19,7 @@ package controller
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"reflect"
 	"sort"
@@ -321,7 +322,7 @@ func (r *ClusterStackReconciler) createOrUpdateProviderClusterStackRelease(ctx c
 	// update if it exists already and should be updated
 	if existsAlready {
 		if shouldUpdate {
-			if err := r.Client.Update(ctx, to); err != nil {
+			if err := r.Update(ctx, to); err != nil {
 				return nil, fmt.Errorf("failed to update object: %w", err)
 			}
 			record.Eventf(clusterStack, "UpdateProviderStackRelease", "Updated ProviderClusterStackRelease %s", name)
@@ -330,7 +331,7 @@ func (r *ClusterStackReconciler) createOrUpdateProviderClusterStackRelease(ctx c
 	}
 
 	// object does not exist yet - create it
-	if err := r.Client.Create(ctx, to); err != nil {
+	if err := r.Create(ctx, to); err != nil {
 		return nil, fmt.Errorf("failed to create object: %w", err)
 	}
 
@@ -646,15 +647,15 @@ func unstructuredSpecEqual(oldObj, newObj map[string]interface{}) (newSpec map[s
 		return nil, false, fmt.Errorf("failed to retrieve spec map of object: %w", err)
 	}
 	if !isEqual {
-		return nil, false, fmt.Errorf("missing spec")
+		return nil, false, errors.New("missing spec")
 	}
 
 	newSpec, isEqual, err = unstructured.NestedMap(newObj, "spec")
 	if err != nil {
 		return nil, false, fmt.Errorf("failed to retrieve spec map of object: %w", err)
 	}
 	if !isEqual {
-		return nil, false, fmt.Errorf("missing spec")
+		return nil, false, errors.New("missing spec")
 	}
 
 	return newSpec, reflect.DeepEqual(oldSpec, newSpec), nil
@@ -726,7 +727,7 @@ func (*ClusterStackReconciler) ClusterStackReleaseToClusterStack(ctx context.Con
 		}
 
 		// check if the controller reference is already set and return an empty result when one is found.
-		for _, ref := range m.ObjectMeta.GetOwnerReferences() {
+		for _, ref := range m.GetOwnerReferences() {
 			result = append(result, reconcile.Request{NamespacedName: types.NamespacedName{Name: ref.Name, Namespace: m.Namespace}})
 		}
 
diff --git a/internal/controller/clusterstackrelease_controller.go b/internal/controller/clusterstackrelease_controller.go
@@ -19,6 +19,7 @@ package controller
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -264,7 +265,7 @@ func (r *ClusterStackReleaseReconciler) updateProviderClusterStackRelease(ctx co
 		return false, fmt.Errorf("failed to create patch helper for ProviderClusterStackRelease: %w", err)
 	}
 
-	if err := controllerutil.SetControllerReference(clusterStackRelease, providerClusterStackRelease, r.Client.Scheme()); err != nil {
+	if err := controllerutil.SetControllerReference(clusterStackRelease, providerClusterStackRelease, r.Scheme()); err != nil {
 		return false, fmt.Errorf("failed to set owner reference to ProviderClusterStackRelease: %w", err)
 	}
 
@@ -273,7 +274,7 @@ func (r *ClusterStackReleaseReconciler) updateProviderClusterStackRelease(ctx co
 	}
 
 	// ensure we add a watch to the external object, if there isn't one already
-	eventHandler := handler.EnqueueRequestForOwner(r.Client.Scheme(), r.Client.RESTMapper(), &csov1alpha1.ClusterStackRelease{})
+	eventHandler := handler.EnqueueRequestForOwner(r.Scheme(), r.RESTMapper(), &csov1alpha1.ClusterStackRelease{})
 	if err := r.externalTracker.Watch(log.FromContext(ctx), providerClusterStackRelease, eventHandler); err != nil {
 		return false, fmt.Errorf("failed to add external watch to ProviderClusterStackRelease: %w", err)
 	}
@@ -302,7 +303,7 @@ func (r *ClusterStackReleaseReconciler) templateAndApply(ctx context.Context, re
 	}
 
 	if template == nil {
-		return false, fmt.Errorf("template is empty")
+		return false, errors.New("template is empty")
 	}
 
 	newResources, shouldRequeue, err := kubeClient.Apply(ctx, template, clusterStackRelease.Status.Resources)
diff --git a/internal/controller/controller_suite_test.go b/internal/controller/controller_suite_test.go
@@ -85,7 +85,7 @@ var _ = BeforeSuite(func() {
 		Expect(testEnv.StartManager(ctx)).To(Succeed())
 	}()
 
-	<-testEnv.Manager.Elected()
+	<-testEnv.Elected()
 	// wait for webhook port to be open prior to running tests
 	testEnv.WaitForWebhooks()
 })
diff --git a/internal/test/helpers/envtest.go b/internal/test/helpers/envtest.go
@@ -262,7 +262,7 @@ func NewTestEnvironment() *TestEnvironment {
 func (t *TestEnvironment) StartManager(ctx context.Context) error {
 	ctx, cancel := context.WithCancel(ctx)
 	t.cancel = cancel
-	if err := t.Manager.Start(ctx); err != nil {
+	if err := t.Start(ctx); err != nil {
 		return fmt.Errorf("failed to start manager: %w", err)
 	}
 	return nil
@@ -292,7 +292,7 @@ func (t *TestEnvironment) Stop() error {
 func (t *TestEnvironment) Cleanup(ctx context.Context, objs ...client.Object) error {
 	errs := make([]error, 0, len(objs))
 	for _, o := range objs {
-		err := t.Client.Delete(ctx, o)
+		err := t.Delete(ctx, o)
 		if apierrors.IsNotFound(err) {
 			// If the object is not found, it must've been garbage collected
 			// already. For example, if we delete namespace first and then
@@ -314,7 +314,7 @@ func (t *TestEnvironment) CreateNamespace(ctx context.Context, generateName stri
 			},
 		},
 	}
-	if err := t.Client.Create(ctx, ns); err != nil {
+	if err := t.Create(ctx, ns); err != nil {
 		return nil, fmt.Errorf("failed to create namespace: %w", err)
 	}
 
diff --git a/internal/test/integration/github/integration_suite_test.go b/internal/test/integration/github/integration_suite_test.go
@@ -62,7 +62,7 @@ var _ = BeforeSuite(func() {
 		defer GinkgoRecover()
 		Expect(testEnv.StartManager(ctx)).To(Succeed())
 	}()
-	<-testEnv.Manager.Elected()
+	<-testEnv.Elected()
 })
 
 var _ = AfterSuite(func() {
diff --git a/internal/test/integration/oci/integration_suite_test.go b/internal/test/integration/oci/integration_suite_test.go
@@ -82,7 +82,7 @@ var _ = BeforeSuite(func() {
 		Expect(testEnv.StartManager(ctx)).To(Succeed())
 	}()
 
-	<-testEnv.Manager.Elected()
+	<-testEnv.Elected()
 
 	// wait for webhook port to be open prior to running tests
 	testEnv.WaitForWebhooks()
diff --git a/internal/test/integration/workloadcluster/controller_suite_test.go b/internal/test/integration/workloadcluster/controller_suite_test.go
@@ -88,7 +88,7 @@ var _ = BeforeSuite(func() {
 		Expect(testEnv.StartManager(ctx)).To(Succeed())
 	}()
 
-	<-testEnv.Manager.Elected()
+	<-testEnv.Elected()
 })
 
 var _ = AfterSuite(func() {
diff --git a/pkg/clusterstack/clusterstack.go b/pkg/clusterstack/clusterstack.go
@@ -18,6 +18,7 @@ limitations under the License.
 package clusterstack
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -48,11 +49,11 @@ type ClusterStack struct {
 
 var (
 	// ErrInvalidFormat indicates a cluster stack string has an invalid format.
-	ErrInvalidFormat = fmt.Errorf("invalid format")
+	ErrInvalidFormat = errors.New("invalid format")
 	// ErrInvalidProvider indicates a cluster stack string has an invalid provider.
-	ErrInvalidProvider = fmt.Errorf("invalid provider")
+	ErrInvalidProvider = errors.New("invalid provider")
 	// ErrInvalidName indicates a cluster stack string has an invalid name.
-	ErrInvalidName = fmt.Errorf("invalid name")
+	ErrInvalidName = errors.New("invalid name")
 )
 
 // NewFromClusterClassProperties returns a ClusterStack based on a cluster stack string.
diff --git a/pkg/kube/helpers.go b/pkg/kube/helpers.go
@@ -316,7 +316,7 @@ func getName(obj runtime.Object) (string, error) {
 	case metav1.Object:
 		return t.GetName(), nil
 	default:
-		return "", fmt.Errorf("object does not implement GetName()")
+		return "", errors.New("object does not implement GetName()")
 	}
 }
 
diff --git a/pkg/kubernetesversion/kubernetesversion.go b/pkg/kubernetesversion/kubernetesversion.go
@@ -18,6 +18,7 @@ limitations under the License.
 package kubernetesversion
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -31,13 +32,13 @@ type KubernetesVersion struct {
 
 var (
 	// ErrInvalidFormat is used for invalid format.
-	ErrInvalidFormat = fmt.Errorf("invalid format")
+	ErrInvalidFormat = errors.New("invalid format")
 
 	// ErrInvalidMajorVersion is used for invalid major version.
-	ErrInvalidMajorVersion = fmt.Errorf("invalid major version")
+	ErrInvalidMajorVersion = errors.New("invalid major version")
 
 	// ErrInvalidMinorVersion is used for invalid minor version.
-	ErrInvalidMinorVersion = fmt.Errorf("invalid minor version")
+	ErrInvalidMinorVersion = errors.New("invalid minor version")
 )
 
 // New returns a kubernetes version from specified major and minor version.
diff --git a/pkg/release/metadata.go b/pkg/release/metadata.go
@@ -17,11 +17,12 @@ limitations under the License.
 package release
 
 import (
+	"errors"
 	"fmt"
 )
 
 // ErrEmptyVersion indicates that the version is empty.
-var ErrEmptyVersion = fmt.Errorf("empty version")
+var ErrEmptyVersion = errors.New("empty version")
 
 // Metadata is the metadata for cluster stacks.
 type Metadata struct {
diff --git a/pkg/release/release.go b/pkg/release/release.go
@@ -18,6 +18,7 @@ limitations under the License.
 package release
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -38,11 +39,11 @@ type Release struct {
 
 var (
 	// ErrEmptyReleaseName indicates release name is not provided.
-	ErrEmptyReleaseName = fmt.Errorf("name is empty")
+	ErrEmptyReleaseName = errors.New("name is empty")
 	// ErrEmptyReleaseCSR indicates cluster stack is not provided.
-	ErrEmptyReleaseCSR = fmt.Errorf("cluster stack is empty")
+	ErrEmptyReleaseCSR = errors.New("cluster stack is empty")
 	// ErrEmptyReleaseDownloadPath indicates download path is not provided.
-	ErrEmptyReleaseDownloadPath = fmt.Errorf("local download path is empty")
+	ErrEmptyReleaseDownloadPath = errors.New("local download path is empty")
 )
 
 const (
diff --git a/pkg/version/version.go b/pkg/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ package controller`
`19`	`19`
`20`	`20`	`import (`
`21`	`21`	`"context"`
	`22`	`+ "errors"`
`22`	`23`	`"fmt"`
`23`	`24`	`"reflect"`
`24`	`25`	`"sort"`
`@@ -321,7 +322,7 @@ func (r *ClusterStackReconciler) createOrUpdateProviderClusterStackRelease(ctx c`
`321`	`322`	`// update if it exists already and should be updated`
`322`	`323`	`if existsAlready {`
`323`	`324`	`if shouldUpdate {`
`324`		`- if err := r.Client.Update(ctx, to); err != nil {`
	`325`	`+ if err := r.Update(ctx, to); err != nil {`
`325`	`326`	`return nil, fmt.Errorf("failed to update object: %w", err)`
`326`	`327`	`}`
`327`	`328`	`record.Eventf(clusterStack, "UpdateProviderStackRelease", "Updated ProviderClusterStackRelease %s", name)`
`@@ -330,7 +331,7 @@ func (r *ClusterStackReconciler) createOrUpdateProviderClusterStackRelease(ctx c`
`330`	`331`	`}`
`331`	`332`
`332`	`333`	`// object does not exist yet - create it`
`333`		`- if err := r.Client.Create(ctx, to); err != nil {`
	`334`	`+ if err := r.Create(ctx, to); err != nil {`
`334`	`335`	`return nil, fmt.Errorf("failed to create object: %w", err)`
`335`	`336`	`}`
`336`	`337`
`@@ -646,15 +647,15 @@ func unstructuredSpecEqual(oldObj, newObj map[string]interface{}) (newSpec map[s`
`646`	`647`	`return nil, false, fmt.Errorf("failed to retrieve spec map of object: %w", err)`
`647`	`648`	`}`
`648`	`649`	`if !isEqual {`
`649`		`- return nil, false, fmt.Errorf("missing spec")`
	`650`	`+ return nil, false, errors.New("missing spec")`
`650`	`651`	`}`
`651`	`652`
`652`	`653`	`newSpec, isEqual, err = unstructured.NestedMap(newObj, "spec")`
`653`	`654`	`if err != nil {`
`654`	`655`	`return nil, false, fmt.Errorf("failed to retrieve spec map of object: %w", err)`
`655`	`656`	`}`
`656`	`657`	`if !isEqual {`
`657`		`- return nil, false, fmt.Errorf("missing spec")`
	`658`	`+ return nil, false, errors.New("missing spec")`
`658`	`659`	`}`
`659`	`660`
`660`	`661`	`return newSpec, reflect.DeepEqual(oldSpec, newSpec), nil`
`@@ -726,7 +727,7 @@ func (*ClusterStackReconciler) ClusterStackReleaseToClusterStack(ctx context.Con`
`726`	`727`	`}`
`727`	`728`
`728`	`729`	`// check if the controller reference is already set and return an empty result when one is found.`
`729`		`- for _, ref := range m.ObjectMeta.GetOwnerReferences() {`
	`730`	`+ for _, ref := range m.GetOwnerReferences() {`
`730`	`731`	`result = append(result, reconcile.Request{NamespacedName: types.NamespacedName{Name: ref.Name, Namespace: m.Namespace}})`
`731`	`732`	`}`
`732`	`733`