[chore]: enable if-return rule from revive (#4784)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.golangci.yaml

@@ -106,8 +106,6 @@ linters:
           disabled: true # FIXME
         - name: identical-switch-branches
           disabled: true # FIXME
-        - name: if-return
-          disabled: true # FIXME
         - name: increment-decrement
           disabled: true # FIXME
         - name: import-alias-naming

cmd/otel-allocator/internal/config/config.go

@@ -311,11 +311,7 @@ func unmarshal(cfg *Config, configFile string) error {
 	if err != nil {
 		return err
 	}
-	if err := decoder.Decode(m); err != nil {
-		return err
-	}
-
-	return nil
+	return decoder.Decode(m)
 }
 
 func CreateDefaultConfig() Config {

internal/manifests/mutate.go

@@ -306,11 +306,7 @@ func mutateDaemonset(existing, desired *appsv1.DaemonSet) error {
 	existing.Spec.RevisionHistoryLimit = desired.Spec.RevisionHistoryLimit
 	existing.Spec.UpdateStrategy = desired.Spec.UpdateStrategy
 
-	if err := mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template); err != nil {
-		return err
-	}
-
-	return nil
+	return mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template)
 }
 
 func mutateDeployment(existing, desired *appsv1.Deployment) error {
@@ -330,11 +326,7 @@ func mutateDeployment(existing, desired *appsv1.Deployment) error {
 	existing.Spec.RevisionHistoryLimit = desired.Spec.RevisionHistoryLimit
 	existing.Spec.Strategy = desired.Spec.Strategy
 
-	if err := mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template); err != nil {
-		return err
-	}
-
-	return nil
+	return mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template)
 }
 
 func mutateStatefulSet(existing, desired *appsv1.StatefulSet) error {
@@ -368,11 +360,7 @@ func mutateStatefulSet(existing, desired *appsv1.StatefulSet) error {
 		existing.Spec.VolumeClaimTemplates[i].Spec = desired.Spec.VolumeClaimTemplates[i].Spec
 	}
 
-	if err := mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template); err != nil {
-		return err
-	}
-
-	return nil
+	return mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template)
 }
 
 func mutateCertificate(existing, desired *cmv1.Certificate) {