[Fix] - Linting and Code Quality Improvements

config/rbac/teranode_service_runner_service_account.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: service-runner
-  namespace: system
+  namespace: system

internal/controller/asset_controller.go

@@ -81,10 +81,10 @@ func (r *AssetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 
 	// Update scale status (replicas and selector) from deployment
 	deployment := &appsv1.Deployment{}
-	if err := r.Get(ctx, types.NamespacedName{
+	if getErr := r.Get(ctx, types.NamespacedName{
 		Name:      AssetDeploymentName,
 		Namespace: asset.Namespace,
-	}, deployment); err == nil {
+	}, deployment); getErr == nil {
 		replicas, selector := utils.GetScaleStatusFromDeployment(deployment)
 		asset.Status.Replicas = replicas
 		asset.Status.Selector = selector

internal/controller/cluster_asset.go

@@ -50,6 +50,7 @@ func (r *ClusterReconciler) ReconcileAsset(log logr.Logger) (bool, error) {
 	return true, nil
 }
 
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func (r *ClusterReconciler) updateAsset(asset *teranodev1alpha1.Asset, cluster *teranodev1alpha1.Cluster) error {
 	err := controllerutil.SetControllerReference(cluster, asset, r.Scheme)
 	if err != nil {
@@ -62,6 +63,7 @@ func (r *ClusterReconciler) updateAsset(asset *teranodev1alpha1.Asset, cluster *
 	}
 
 	// Selectively merge cluster spec - only override fields that are explicitly set
+	//nolint:nestif // Nested conditions required for selective field merging
 	if cluster.Spec.Asset.Spec != nil {
 		clusterSpec := cluster.Spec.Asset.Spec
 

internal/controller/cluster_helpers.go

@@ -6,6 +6,8 @@ import (
 
 // mergeDeploymentOverrides selectively merges deployment overrides from cluster spec
 // Only fields explicitly set in clusterOverrides will override the target
+//
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override fields
 func mergeDeploymentOverrides(target *teranodev1alpha1.DeploymentOverrides, clusterOverrides *teranodev1alpha1.DeploymentOverrides) {
 	if clusterOverrides.Replicas != nil {
 		target.Replicas = clusterOverrides.Replicas

internal/controller/cluster_propagation.go

@@ -50,6 +50,7 @@ func (r *ClusterReconciler) ReconcilePropagation(log logr.Logger) (bool, error)
 	return true, nil
 }
 
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func (r *ClusterReconciler) updatePropagation(propagation *teranodev1alpha1.Propagation, cluster *teranodev1alpha1.Cluster) error {
 	err := controllerutil.SetControllerReference(cluster, propagation, r.Scheme)
 	if err != nil {
@@ -62,6 +63,7 @@ func (r *ClusterReconciler) updatePropagation(propagation *teranodev1alpha1.Prop
 	}
 
 	// Selectively merge cluster spec - only override fields that are explicitly set
+	//nolint:nestif // Nested conditions required for selective field merging
 	if cluster.Spec.Propagation.Spec != nil {
 		clusterSpec := cluster.Spec.Propagation.Spec
 

internal/controller/cluster_rpc.go

@@ -50,6 +50,7 @@ func (r *ClusterReconciler) ReconcileRPC(log logr.Logger) (bool, error) {
 	return true, nil
 }
 
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func (r *ClusterReconciler) updateRPC(rpc *teranodev1alpha1.RPC, cluster *teranodev1alpha1.Cluster) error {
 	err := controllerutil.SetControllerReference(cluster, rpc, r.Scheme)
 	if err != nil {

internal/controller/cluster_subtreevalidator.go

@@ -50,6 +50,7 @@ func (r *ClusterReconciler) ReconcileSubtreeValidator(log logr.Logger) (bool, er
 	return true, nil
 }
 
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func (r *ClusterReconciler) updateSubtreeValidator(subtreeValidator *teranodev1alpha1.SubtreeValidator, cluster *teranodev1alpha1.Cluster) error {
 	err := controllerutil.SetControllerReference(cluster, subtreeValidator, r.Scheme)
 	if err != nil {
@@ -62,6 +63,7 @@ func (r *ClusterReconciler) updateSubtreeValidator(subtreeValidator *teranodev1a
 	}
 
 	// Selectively merge cluster spec - only override fields that are explicitly set
+	//nolint:nestif // Nested conditions required for selective field merging
 	if cluster.Spec.SubtreeValidator.Spec != nil {
 		clusterSpec := cluster.Spec.SubtreeValidator.Spec
 

internal/controller/propagation_controller.go

@@ -85,10 +85,10 @@ func (r *PropagationReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Update scale status (replicas and selector) from deployment
 	deployment := &appsv1.Deployment{}
-	if err := r.Get(ctx, types.NamespacedName{
+	if getErr := r.Get(ctx, types.NamespacedName{
 		Name:      PropagationDeploymentName,
 		Namespace: propagation.Namespace,
-	}, deployment); err == nil {
+	}, deployment); getErr == nil {
 		replicas, selector := utils.GetScaleStatusFromDeployment(deployment)
 		propagation.Status.Replicas = replicas
 		propagation.Status.Selector = selector

internal/controller/subtreevalidator_controller.go

@@ -79,10 +79,10 @@ func (r *SubtreeValidatorReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	// Update scale status (replicas and selector) from deployment
 	deployment := &appsv1.Deployment{}
-	if err := r.Get(ctx, types.NamespacedName{
+	if getErr := r.Get(ctx, types.NamespacedName{
 		Name:      SubtreeValidatorDeploymentName,
 		Namespace: req.Namespace,
-	}, deployment); err == nil {
+	}, deployment); getErr == nil {
 		replicas, selector := utils.GetScaleStatusFromDeployment(deployment)
 		subtreeValidator.Status.Replicas = replicas
 		subtreeValidator.Status.Selector = selector

internal/utils/deployment.go

@@ -29,11 +29,11 @@ import (
 	"github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
 )
 
-//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func SetDeploymentOverrides(client client.Client, dep *appsv1.Deployment, cr v1alpha1.TeranodeService) {
 	SetDeploymentOverridesWithContext(context.Background(), logr.Logger{}, client, dep, cr, "")
 }
 
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func SetDeploymentOverridesWithContext(ctx context.Context, log logr.Logger, client client.Client, dep *appsv1.Deployment, cr v1alpha1.TeranodeService, crKind string) {
 	if cr.DeploymentOverrides() == nil {
 		return
@@ -122,6 +122,7 @@ func SetDeploymentOverridesWithContext(ctx context.Context, log logr.Logger, cli
 	}
 }
 
+//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override cases
 func SetClusterOverrides(client client.Client, dep *appsv1.Deployment, cr v1alpha1.TeranodeService) {
 	// if parent cluster CR has a configmap or env vars set, append it first
 	clusterOwner := GetClusterOwner(client, context.Background(), cr.Metadata())