Merge pull request #2003 from kube-logging/chore/migrate-to-v2-golangci

chore: migrate to v2 golangci-lint

Author: csatib02

.golangci.yml

@@ -1,15 +1,39 @@
-linters-settings:
-    revive:
-        min-confidence: 0.9
-    gocyclo:
-        min-complexity: 15
+version: "2"
+run:
+  timeout: 10m
+  allow-parallel-runners: true
 
+formatters:
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/kube-logging/logging-operator)
+    goimports:
+      local-prefixes:
+        - github.com/kube-logging/logging-operator
+    gofmt:
+      simplify: true
+    gofumpt:
+      extra-rules: false
 
-issues:
-  exclude-dirs:
-    - .gen
-    - client
-  exclude:
-        - if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
-        - "`if` block ends with a `return` statement, so drop this `else` and outdent its block"
-        - "missing the call to method parallel"
+linters:
+  settings:
+    misspell:
+      locale: US
+    revive:
+      confidence: 0.9
+    gocyclo:
+      min-complexity: 15
+  enable:
+    - bodyclose
+    - errcheck
+    - ineffassign
+    - misspell
+    - nolintlint
+    - revive
+    - unconvert
+    - unparam
+    - unused
+    - whitespace

Makefile

@@ -8,7 +8,7 @@
 CONTROLLER_GEN_VERSION := 0.17.2
 
 # renovate: datasource=github-releases depName=golangci/golangci-lint versioning=semver
-GOLANGCI_LINT_VERSION := 1.64.8
+GOLANGCI_LINT_VERSION := 2.0.2
 
 # renovate: datasource=go depName=github.com/vladopajic/go-test-coverage/v2 versioning=semver
 GO_TEST_COVERAGE_VERSION := 2.13.0
@@ -284,7 +284,7 @@ ${ENVTEST_BINARY_ASSETS}_${ENVTEST_K8S_VERSION}: | ${SETUP_ENVTEST} ${ENVTEST_BI
 ${GOLANGCI_LINT}: ${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION} | ${BIN}
 	ln -sf $(notdir $<) $@
 
-${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: IMPORT_PATH := github.com/golangci/golangci-lint/cmd/golangci-lint
+${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: IMPORT_PATH := github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 ${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: VERSION := v${GOLANGCI_LINT_VERSION}
 ${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: | ${BIN}
 	${go_install_binary}

controllers/extensions/eventtailer_controller.go

@@ -56,7 +56,7 @@ func (r *EventTailerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	eventTailer := loggingextensionsv1alpha1.EventTailer{}
 
-	if err := r.Client.Get(ctx, req.NamespacedName, &eventTailer); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &eventTailer); err != nil {
 		if apierrors.IsNotFound(err) {
 			return reconcile.Result{}, nil
 		}

controllers/extensions/hosttailer_controller.go

@@ -54,7 +54,7 @@ func (r *HostTailerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	hosttailer := loggingextensionsv1alpha1.HostTailer{}
 
-	if err := r.Client.Get(ctx, req.NamespacedName, &hosttailer); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &hosttailer); err != nil {
 		if apierrors.IsNotFound(err) {
 			return reconcile.Result{}, nil
 		}

controllers/logging/logging_controller.go

@@ -111,7 +111,7 @@ func (r *LoggingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	log.V(1).Info("reconciling")
 
 	var logging loggingv1beta1.Logging
-	if err := r.Client.Get(ctx, req.NamespacedName, &logging); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &logging); err != nil {
 		// If object is not found, return without error.
 		// Created objects are automatically garbage collected.
 		// For additional cleanup logic use finalizers.
@@ -120,14 +120,14 @@ func (r *LoggingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	var missingCRDs []string
 
-	if err := r.Client.List(ctx, &v1.ServiceMonitorList{}); err == nil {
+	if err := r.List(ctx, &v1.ServiceMonitorList{}); err == nil {
 		//nolint:staticcheck
 		ctx = context.WithValue(ctx, resources.ServiceMonitorKey, true)
 	} else {
 		missingCRDs = append(missingCRDs, "ServiceMonitor")
 	}
 
-	if err := r.Client.List(ctx, &v1.PrometheusRuleList{}); err == nil {
+	if err := r.List(ctx, &v1.PrometheusRuleList{}); err == nil {
 		//nolint:staticcheck
 		ctx = context.WithValue(ctx, resources.PrometheusRuleKey, true)
 	} else {
@@ -384,7 +384,7 @@ func (r *LoggingReconciler) syslogNGConfigFinalizer(ctx context.Context, logging
 
 func (r *LoggingReconciler) dynamicDefaults(ctx context.Context, log logr.Logger, syslogNGSpec *loggingv1beta1.SyslogNGSpec) {
 	nodes := corev1.NodeList{}
-	if err := r.Client.List(ctx, &nodes); err != nil {
+	if err := r.List(ctx, &nodes); err != nil {
 		log.Error(err, "listing nodes")
 	}
 	if syslogNGSpec != nil && syslogNGSpec.MaxConnections == 0 {

controllers/logging/loggingroute_controller.go

@@ -49,7 +49,7 @@ type LoggingRouteReconciler struct {
 // Reconcile routes between logging domains
 func (r *LoggingRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	var loggingRoute loggingv1beta1.LoggingRoute
-	if err := r.Client.Get(ctx, req.NamespacedName, &loggingRoute); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &loggingRoute); err != nil {
 		return reconcile.Result{}, client.IgnoreNotFound(err)
 	}
 

controllers/logging/telemetry_controller_controller.go

@@ -53,7 +53,7 @@ func (r *TelemetryControllerReconciler) Reconcile(ctx context.Context, req ctrl.
 	log := r.Log.WithValues("telemetry-controller", req.Name)
 
 	var logging loggingv1beta1.Logging
-	if err := r.Client.Get(ctx, req.NamespacedName, &logging); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &logging); err != nil {
 		return reconcile.Result{}, client.IgnoreNotFound(err)
 	}
 
@@ -100,11 +100,11 @@ func (r *TelemetryControllerReconciler) createTelemetryControllerResources(logge
 func (r *TelemetryControllerReconciler) finalizeLoggingForTelemetryController(ctx context.Context, logger logr.Logger, logging *loggingv1beta1.Logging, objectsToCreate *[]client.Object) error {
 	logger.Info("Finalizing Telemetry controller resources")
 
-	if logging.ObjectMeta.DeletionTimestamp.IsZero() {
+	if logging.DeletionTimestamp.IsZero() {
 		if !controllerutil.ContainsFinalizer(logging, TelemetryControllerFinalizer) {
 			r.Log.Info("adding telemetrycontroller finalizer")
 			controllerutil.AddFinalizer(logging, TelemetryControllerFinalizer)
-			if err := r.Client.Update(ctx, logging); err != nil {
+			if err := r.Update(ctx, logging); err != nil {
 				return err
 			}
 		}
@@ -117,7 +117,7 @@ func (r *TelemetryControllerReconciler) finalizeLoggingForTelemetryController(ct
 
 			r.Log.Info("removing telemetrycontroller finalizer")
 			controllerutil.RemoveFinalizer(logging, TelemetryControllerFinalizer)
-			if err := r.Client.Update(ctx, logging); err != nil {
+			if err := r.Update(ctx, logging); err != nil {
 				return err
 			}
 		}
@@ -130,11 +130,11 @@ func (r *TelemetryControllerReconciler) deployTelemetryControllerResources(ctx c
 	logger.Info("Deploying Telemetry controller resources")
 
 	for _, objectToCreate := range *objectsToCreate {
-		if err := r.Client.Get(ctx, client.ObjectKeyFromObject(objectToCreate), objectToCreate); err != nil {
+		if err := r.Get(ctx, client.ObjectKeyFromObject(objectToCreate), objectToCreate); err != nil {
 			if !apierrors.IsNotFound(err) {
 				return err
 			}
-			if err := r.Client.Create(ctx, objectToCreate); err != nil {
+			if err := r.Create(ctx, objectToCreate); err != nil {
 				return err
 			}
 			logger.Info("Created object", "object", objectToCreate.GetName())
@@ -150,7 +150,7 @@ func (r *TelemetryControllerReconciler) deleteTelemetryControllerResources(ctx c
 	logger.Info("Logging resource is being deleted, deleting Telemetry controller resources")
 
 	for _, obj := range *objectsToCreate {
-		if err := r.Client.Delete(ctx, obj); err != nil {
+		if err := r.Delete(ctx, obj); err != nil {
 			return client.IgnoreNotFound(err)
 		}
 		logger.Info("Deleted object", "object", obj.GetName())
@@ -164,7 +164,7 @@ func (r *TelemetryControllerReconciler) isAggregatorReady(ctx context.Context, l
 
 	podName := fmt.Sprintf("%s-fluentd-0", logging.Name)
 	pod := &corev1.Pod{}
-	err := r.Client.Get(ctx, client.ObjectKey{Name: podName, Namespace: logging.Spec.ControlNamespace}, pod)
+	err := r.Get(ctx, client.ObjectKey{Name: podName, Namespace: logging.Spec.ControlNamespace}, pod)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			return fmt.Errorf("aggregator pod: %s not found", podName)

docs/configuration/crds/v1beta1/fluentd_types.md

@@ -228,7 +228,7 @@ ExtraVolume defines the fluentd extra volumes
 
 ## FluentdScaling
 
-FluentdScaling enables configuring the scaling behaviour of the fluentd statefulset
+FluentdScaling enables configuring the scaling behavior of the fluentd statefulset
 
 ### drain (FluentdDrainConfig, optional) {#fluentdscaling-drain}
 

docs/configuration/plugins/filters/elasticsearch_genid.md

@@ -64,7 +64,7 @@ You can specify keys which are record in events for hash generation seed. This p
 
 ### separator (string, optional) {#elasticsearchgenid-separator}
 
-You can specify separator charactor to creating seed for hash generation. 
+You can specify separator character to creating seed for hash generation. 
 
 
 ### use_entire_record (bool, optional) {#elasticsearchgenid-use_entire_record}

docs/configuration/plugins/filters/parser.md

@@ -127,7 +127,7 @@ If true, keep time field in the record.
 
 ### keys (string, optional) {#parse section-keys}
 
-Names for fields on each line. (seperated by coma) 
+Names for fields on each line. (separated by coma) 
 
 
 ### label_delimiter (string, optional) {#parse section-label_delimiter}

main.go

@@ -257,7 +257,6 @@ func main() {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
-
 }
 
 // Extends sigs.k8s.io/[email protected]/pkg/manager/signals/signal.go with

pkg/resources/configcheck/configcheck.go

@@ -34,7 +34,7 @@ func WithHashLabel(accessor v1.Object, hash string) {
 	accessor.SetLabels(l)
 }
 
-func hasHashLabel(accessor v1.Object, hash string) (has bool, match bool) {
+func hasHashLabel(accessor v1.Object, hash string) (has bool, match bool) { //nolint: unparam
 	l := accessor.GetLabels()
 	var val string
 	val, has = l[HashLabel]

pkg/resources/eventtailer/clusterrolebinding.go

@@ -17,22 +17,21 @@ package eventtailer
 import (
 	"github.com/cisco-open/operator-tools/pkg/reconciler"
 	rbacv1 "k8s.io/api/rbac/v1"
-	v1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // ClusterRoleBinding resource for reconciler
 func (e *EventTailer) ClusterRoleBinding() (runtime.Object, reconciler.DesiredState, error) {
-	clusterRoleBinding := v1.ClusterRoleBinding{
+	clusterRoleBinding := rbacv1.ClusterRoleBinding{
 		ObjectMeta: e.clusterObjectMeta(),
-		Subjects: []v1.Subject{
+		Subjects: []rbacv1.Subject{
 			{
 				Kind:      rbacv1.ServiceAccountKind,
 				Name:      e.Name(),
 				Namespace: e.customResource.Spec.ControlNamespace,
 			},
 		},
-		RoleRef: v1.RoleRef{
+		RoleRef: rbacv1.RoleRef{
 			APIGroup: rbacv1.GroupName,
 			Kind:     "ClusterRole",
 			Name:     e.Name(),

pkg/resources/eventtailer/helpers.go

@@ -20,16 +20,16 @@ import (
 	"github.com/cisco-open/operator-tools/pkg/types"
 	"github.com/cisco-open/operator-tools/pkg/utils"
 	config "github.com/kube-logging/logging-operator/pkg/sdk/extensions/extensionsconfig"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // Name .
 func (e *EventTailer) Name() string {
-	return fmt.Sprintf("%v-%v", e.customResource.ObjectMeta.Name, config.EventTailer.TailerAffix)
+	return fmt.Sprintf("%v-%v", e.customResource.Name, config.EventTailer.TailerAffix)
 }
 
-func (e *EventTailer) objectMeta() v1.ObjectMeta {
-	meta := v1.ObjectMeta{
+func (e *EventTailer) objectMeta() metav1.ObjectMeta {
+	meta := metav1.ObjectMeta{
 		Name:            e.Name(),
 		Namespace:       e.customResource.Spec.ControlNamespace,
 		Labels:          e.selectorLabels(),
@@ -38,22 +38,22 @@ func (e *EventTailer) objectMeta() v1.ObjectMeta {
 	return meta
 }
 
-func (e *EventTailer) clusterObjectMeta() v1.ObjectMeta {
-	meta := v1.ObjectMeta{
+func (e *EventTailer) clusterObjectMeta() metav1.ObjectMeta {
+	meta := metav1.ObjectMeta{
 		Name:            e.Name(),
 		Labels:          e.selectorLabels(),
 		OwnerReferences: e.ownerReferences(),
 	}
 	return meta
 }
 
-func (e *EventTailer) ownerReferences() []v1.OwnerReference {
-	ownerReferences := []v1.OwnerReference{
+func (e *EventTailer) ownerReferences() []metav1.OwnerReference {
+	ownerReferences := []metav1.OwnerReference{
 		{
-			APIVersion: e.customResource.TypeMeta.APIVersion,
-			Kind:       e.customResource.TypeMeta.Kind,
-			Name:       e.customResource.ObjectMeta.Name,
-			UID:        e.customResource.ObjectMeta.UID,
+			APIVersion: e.customResource.APIVersion,
+			Kind:       e.customResource.Kind,
+			Name:       e.customResource.Name,
+			UID:        e.customResource.UID,
 			Controller: utils.BoolPointer(true),
 		},
 	}

pkg/resources/eventtailer/statefulset.go

@@ -47,7 +47,6 @@ func (e *EventTailer) StatefulSet() (runtime.Object, reconciler.DesiredState, er
 }
 
 func (e *EventTailer) statefulSetSpec() *appsv1.StatefulSetSpec {
-
 	if e.customResource.Spec.Image != nil {
 		if repositoryWithTag := e.customResource.Spec.Image.RepositoryWithTag(); repositoryWithTag != "" {
 			if e.customResource.Spec.ContainerBase == nil {
@@ -60,7 +59,7 @@ func (e *EventTailer) statefulSetSpec() *appsv1.StatefulSetSpec {
 		if e.customResource.Spec.ContainerBase == nil {
 			e.customResource.Spec.ContainerBase = &types.ContainerBase{}
 		}
-		e.customResource.Spec.ContainerBase.PullPolicy = corev1.PullPolicy(e.customResource.Spec.ContainerBase.PullPolicy)
+		e.customResource.Spec.ContainerBase.PullPolicy = corev1.PullPolicy(e.customResource.Spec.ContainerBase.PullPolicy) //nolint: unconvert
 	}
 
 	var imagePullSecrets []corev1.LocalObjectReference

pkg/resources/fluentbit/configsecret.go

@@ -306,7 +306,6 @@ func (r *Reconciler) configSecret() (runtime.Object, reconciler.DesiredState, er
 		inputTail.DockerMode = ""
 		inputTail.DockerModeFlush = ""
 		inputTail.DockerModeParser = ""
-
 	} else if len(inputTail.ParserN) > 0 {
 		input.Input.ParserN = inputTail.ParserN
 		inputTail.ParserN = nil

pkg/resources/fluentbit/daemonset.go

@@ -38,7 +38,6 @@ const (
 )
 
 func (r *Reconciler) daemonSet() (runtime.Object, reconciler.DesiredState, error) {
-
 	labels := util.MergeLabels(r.fluentbitSpec.Labels, r.getFluentBitLabels())
 	meta := r.FluentbitObjectMeta(fluentbitDaemonSetName)
 	meta.Annotations = util.MergeLabels(meta.Annotations, r.fluentbitSpec.DaemonSetAnnotations)

pkg/resources/fluentbit/tenants.go

@@ -124,8 +124,7 @@ func (r *Reconciler) configureOutputsForTenants(ctx context.Context, tenants []v
 	return errs
 }
 
-func (r *Reconciler) configureInputsForTenants(tenants []v1beta1.Tenant, input *fluentBitConfig) error {
-	var errs error
+func (r *Reconciler) configureInputsForTenants(tenants []v1beta1.Tenant, input *fluentBitConfig) error { //nolint: unparam
 	for _, t := range tenants {
 		allNamespaces := len(t.Namespaces) == 0
 		tenantValues := maps.Clone(input.Input.Values)
@@ -150,7 +149,7 @@ func (r *Reconciler) configureInputsForTenants(tenants []v1beta1.Tenant, input *
 	}
 	// the regex will work only if we cut the prefix off. fluentbit doesn't care about the content, just the length
 	input.KubernetesFilter["Kube_Tag_Prefix"] = `kubernetes.0000000000.var.log.containers.`
-	return errs
+	return nil
 }
 
 func hashFromTenantName(input string) string {