Merge pull request #4396 from r-vasquez/k8s-lint-fix

k8s: fix lint warnings and disabling gomnd

src/go/k8s/.golangci.yml

@@ -48,7 +48,6 @@ linters:
     - gocritic
     - gocyclo
     - revive
-    - gomnd
     - goprintffuncname
     - gosec
     - gosimple
@@ -84,6 +83,7 @@ linters:
   # - gochecknoglobals
   # - gocognit
   # - godot
+  # - gomnd
   # - godox
   # - goerr113
   # - maligned

src/go/k8s/apis/redpanda/v1alpha1/cluster_webhook_test.go

@@ -301,7 +301,7 @@ func TestValidateUpdate_NoError(t *testing.T) {
 	})
 
 	t.Run("scale up", func(t *testing.T) {
-		var scaleUp int32 = *redpandaCluster.Spec.Replicas + 1
+		scaleUp := *redpandaCluster.Spec.Replicas + 1
 		updatedScaleUp := redpandaCluster.DeepCopy()
 		updatedScaleUp.Spec.Replicas = &scaleUp
 		err := updatedScaleUp.ValidateUpdate(redpandaCluster)

src/go/k8s/cmd/configurator/main.go

@@ -13,7 +13,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -145,7 +144,7 @@ func main() {
 
 	log.Printf("Config: %s", string(cfgBytes))
 
-	if err := ioutil.WriteFile(c.configDestination, cfgBytes, 0600); err != nil {
+	if err := os.WriteFile(c.configDestination, cfgBytes, 0o600); err != nil {
 		log.Fatalf("%s", fmt.Errorf("unable to write the destination configuration file: %w", err))
 	}
 

src/go/k8s/pkg/resources/statefulset.go

@@ -554,11 +554,9 @@ func (r *StatefulSetResource) getPreStopHook() *corev1.Handler {
 	curlCommand := r.composeCURLMaintenanceCommand(`-X PUT --silent -o /dev/null -w "%{http_code}"`, nil)
 	genericMaintenancePath := "/v1/maintenance"
 	curlGetCommand := r.composeCURLMaintenanceCommand(`--silent`, &genericMaintenancePath)
-	cmd := strings.Join(
-		[]string{
-			fmt.Sprintf(`until [ "${status:-}" = "200" ]; do status=$(%s); sleep 0.5; done`, curlCommand),
-			fmt.Sprintf(`until [ "${finished:-}" = "true" ]; do finished=$(%s | grep -o '\"finished\":[^,}]*' | grep -o '[^: ]*$'); sleep 0.5; done`, curlGetCommand),
-		}, " && ")
+	cmd := fmt.Sprintf(`until [ "${status:-}" = "200" ]; do status=$(%s); sleep 0.5; done`, curlCommand) +
+		" && " +
+		fmt.Sprintf(`until [ "${finished:-}" = "true" ]; do finished=$(%s | grep -o '\"finished\":[^,}]*' | grep -o '[^: ]*$'); sleep 0.5; done`, curlGetCommand)
 
 	return &corev1.Handler{
 		Exec: &corev1.ExecAction{

src/go/k8s/pkg/resources/statefulset_update.go

@@ -392,7 +392,7 @@ func (r *StatefulSetResource) queryRedpandaStatus(
 		adminURL.Scheme = "https"
 	}
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, adminURL.String(), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, adminURL.String(), http.NoBody)
 	if err != nil {
 		return err
 	}