From 3499dcef716430610b400f01f6522d1c50844f18 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Sun, 30 Mar 2025 16:15:29 +0200 Subject: [PATCH] Revert "ci(lint): re-enable prealloc in golangci-lint config" This reverts commit a889852897036eadf69369d9cd77caa3b3e8f546. --- .golangci.yml | 2 +- pkg/configuration/base/reconciler.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c64a7ea1..7a49a3ef 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -28,7 +28,7 @@ linters: - loggercheck - misspell - nakedret - - prealloc + # - prealloc - staticcheck - typecheck - unconvert diff --git a/pkg/configuration/base/reconciler.go b/pkg/configuration/base/reconciler.go index 34161c1a..e5096513 100644 --- a/pkg/configuration/base/reconciler.go +++ b/pkg/configuration/base/reconciler.go @@ -267,7 +267,7 @@ func compareMap(expected, actual map[string]string) bool { } func compareEnv(expected, actual []corev1.EnvVar) bool { - actualEnv := make([]corev1.EnvVar, 0, len(actual)) + var actualEnv []corev1.EnvVar for _, env := range actual { if env.Name == "KUBERNETES_PORT_443_TCP_ADDR" || env.Name == "KUBERNETES_PORT" || env.Name == "KUBERNETES_PORT_443_TCP" || env.Name == "KUBERNETES_SERVICE_HOST" { @@ -292,7 +292,7 @@ func CompareContainerVolumeMounts(expected corev1.Container, actual corev1.Conta // compareVolumes returns true if Jenkins pod and Jenkins CR volumes are the same func (r *JenkinsBaseConfigurationReconciler) compareVolumes(actualPod corev1.Pod) bool { - toCompare := make([]corev1.Volume, 0, len(actualPod.Spec.Volumes)) + var toCompare []corev1.Volume for _, volume := range actualPod.Spec.Volumes { // filter out service account if strings.HasPrefix(volume.Name, actualPod.Spec.ServiceAccountName) {