K8SPG-1080 v3 module

.golangci.yaml

@@ -57,7 +57,7 @@ linters:
           deny:
             - pkg: net/http/httptest
               desc: Should be used only in tests.
-            - pkg: github.com/percona/percona-postgresql-operator/v2/internal/testing/*
+            - pkg: github.com/percona/percona-postgresql-operator/v3/internal/testing/*
               desc: The "internal/testing" packages should be used only in tests.
             - pkg: errors
               desc: Use "github.com/pkg/errors" instead (errors.Wrap/Wrapf/Errorf) for stack traces.

Jenkinsfile

@@ -517,7 +517,7 @@ pipeline {
                                  -e GO111MODULE=on \
                                  golang:1.26.0 sh -c '
                                      go install github.com/google/go-licenses@latest;
-                                     /go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/v2/cmd/postgres-operator \
+                                     /go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/v3/cmd/postgres-operator \
                                          | cut -d , -f 3 \
                                          | sort -u \
                                          > go-licenses-new || :

Makefile

@@ -117,6 +117,12 @@ build-postgres-operator: ## Build the postgres-operator binary
 		) --trimpath -o bin/postgres-operator ./cmd/postgres-operator
 
 ##@ Test
+GOLANGCI_LINT_VERSION ?= v2.12.2
+
+.PHONY: lint
+lint: ## Run golangci-lint (same as CI)
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) run --timeout 5m --max-issues-per-linter 0 --max-same-issues 0
+
 .PHONY: check
 check: ## Run basic go tests with coverage output
 check: get-pgmonitor

cmd/extension-installer/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/percona/percona-postgresql-operator/v2/percona/extensions"
+	"github.com/percona/percona-postgresql-operator/v3/percona/extensions"
 )
 
 func main() {
@@ -77,7 +77,7 @@ func initStorage(storageType extensions.StorageType, endpoint, bucket, region st
 	case extensions.StorageTypeS3:
 		return extensions.NewS3(endpoint, region, bucket, s3ForcePathStyle, disableSSL)
 	default:
-		log.Fatalf("unknown storage type: %s", os.Getenv("STORAGE_TYPE"))
+		log.Fatalf("unknown storage type: %s", string(storageType))
 	}
 
 	return nil

cmd/pgbackrest/main.go

@@ -142,6 +142,10 @@ func (k *KubeAPI) Exec(ctx context.Context, namespace, pod, container string, st
 		}, ParameterCodec)
 
 	exec, err := remotecommand.NewSPDYExecutor(k.Config, "POST", request.URL())
+	if err != nil {
+		log.Error(err)
+		return err
+	}
 
 	stdoutReader, stdoutWriter := io.Pipe()
 	defer func() {
@@ -384,7 +388,7 @@ else
 fi
 `
 
-	localHashCmd := exec.Command("bash", "-ceu", "--", localScript)
+	localHashCmd := exec.CommandContext(ctx, "bash", "-ceu", "--", localScript)
 	hashOutput, err := localHashCmd.Output()
 	if err != nil {
 		log.Fatalf("unable to calculate hash for pgBackRest config: %v", err)

cmd/pgbouncer-startup/main.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	pgbruntime "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime/pgbouncer"
-	"github.com/percona/percona-postgresql-operator/v2/internal/pgbouncer/startup"
+	pgbruntime "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime/pgbouncer"
+	"github.com/percona/percona-postgresql-operator/v3/internal/pgbouncer/startup"
 )
 
 const (

cmd/pgbouncer-startup/main_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/mock"
 	"gotest.tools/v3/assert"
 
-	pgbmock "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime/pgbouncer/mock"
-	"github.com/percona/percona-postgresql-operator/v2/internal/pgbouncer/startup"
+	pgbmock "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime/pgbouncer/mock"
+	"github.com/percona/percona-postgresql-operator/v3/internal/pgbouncer/startup"
 )
 
 func TestPauseWanted(t *testing.T) {

cmd/postgres-operator/main.go

@@ -30,26 +30,26 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/percona/percona-postgresql-operator/v2/internal/controller/pgupgrade"
-	"github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster"
-	"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
-	"github.com/percona/percona-postgresql-operator/v2/internal/controller/standalone_pgadmin"
-	"github.com/percona/percona-postgresql-operator/v2/internal/feature"
-	"github.com/percona/percona-postgresql-operator/v2/internal/logging"
-	"github.com/percona/percona-postgresql-operator/v2/internal/naming"
-	"github.com/percona/percona-postgresql-operator/v2/internal/upgradecheck"
-	"github.com/percona/percona-postgresql-operator/v2/percona/certmanager"
-	perconaController "github.com/percona/percona-postgresql-operator/v2/percona/controller"
-	"github.com/percona/percona-postgresql-operator/v2/percona/controller/pgbackup"
-	"github.com/percona/percona-postgresql-operator/v2/percona/controller/pgcluster"
-	"github.com/percona/percona-postgresql-operator/v2/percona/controller/pgrestore"
-	perconaPGUpgrade "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgupgrade"
-	"github.com/percona/percona-postgresql-operator/v2/percona/k8s"
-	perconaRuntime "github.com/percona/percona-postgresql-operator/v2/percona/runtime"
-	"github.com/percona/percona-postgresql-operator/v2/percona/utils/registry"
-	"github.com/percona/percona-postgresql-operator/v2/percona/watcher"
-	v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2"
-	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v3/internal/controller/pgupgrade"
+	"github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster"
+	"github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime"
+	"github.com/percona/percona-postgresql-operator/v3/internal/controller/standalone_pgadmin"
+	"github.com/percona/percona-postgresql-operator/v3/internal/feature"
+	"github.com/percona/percona-postgresql-operator/v3/internal/logging"
+	"github.com/percona/percona-postgresql-operator/v3/internal/naming"
+	"github.com/percona/percona-postgresql-operator/v3/internal/upgradecheck"
+	"github.com/percona/percona-postgresql-operator/v3/percona/certmanager"
+	perconaController "github.com/percona/percona-postgresql-operator/v3/percona/controller"
+	"github.com/percona/percona-postgresql-operator/v3/percona/controller/pgbackup"
+	"github.com/percona/percona-postgresql-operator/v3/percona/controller/pgcluster"
+	"github.com/percona/percona-postgresql-operator/v3/percona/controller/pgrestore"
+	perconaPGUpgrade "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgupgrade"
+	"github.com/percona/percona-postgresql-operator/v3/percona/k8s"
+	perconaRuntime "github.com/percona/percona-postgresql-operator/v3/percona/runtime"
+	"github.com/percona/percona-postgresql-operator/v3/percona/utils/registry"
+	"github.com/percona/percona-postgresql-operator/v3/percona/watcher"
+	v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2"
+	"github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1"
 )
 
 var (
@@ -158,7 +158,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error {
 		APIReader:           mgr.GetAPIReader(), // K8SPG-992
 		Scheme:              mgr.GetScheme(),
 		Owner:               postgrescluster.ControllerName,
-		Recorder:            mgr.GetEventRecorderFor(postgrescluster.ControllerName),
+		Recorder:            mgr.GetEventRecorderFor(postgrescluster.ControllerName), //nolint:staticcheck
 		Tracer:              otel.Tracer(postgrescluster.ControllerName),
 		IsOpenShift:         openShift,
 		CertManagerCtrlFunc: certmanager.NewController,
@@ -204,7 +204,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error {
 	pc := &pgcluster.PGClusterReconciler{
 		Client:               mgr.GetClient(),
 		Owner:                pgcluster.PGClusterControllerName,
-		Recorder:             mgr.GetEventRecorderFor(pgcluster.PGClusterControllerName),
+		Recorder:             mgr.GetEventRecorderFor(pgcluster.PGClusterControllerName), //nolint:staticcheck
 		Tracer:               otel.Tracer(pgcluster.PGClusterControllerName),
 		Platform:             platform,
 		KubeVersion:          getServerVersion(ctx, mgr.GetConfig()),
@@ -259,7 +259,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error {
 	pr := &pgrestore.PGRestoreReconciler{
 		Client:   mgr.GetClient(),
 		Owner:    pgrestore.PGRestoreControllerName,
-		Recorder: mgr.GetEventRecorderFor(pgrestore.PGRestoreControllerName),
+		Recorder: mgr.GetEventRecorderFor(pgrestore.PGRestoreControllerName), //nolint:staticcheck
 		Tracer:   otel.Tracer(pgrestore.PGRestoreControllerName),
 	}
 	if err := pr.SetupWithManager(mgr); err != nil {
@@ -285,7 +285,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error {
 	pgAdminReconciler := &standalone_pgadmin.PGAdminReconciler{
 		Client:      mgr.GetClient(),
 		Owner:       "pgadmin-controller",
-		Recorder:    mgr.GetEventRecorderFor(naming.ControllerPGAdmin),
+		Recorder:    mgr.GetEventRecorderFor(naming.ControllerPGAdmin), //nolint:staticcheck
 		IsOpenShift: openShift,
 	}
 

cmd/postgres-operator/main_test.go

@@ -12,7 +12,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
 
-	"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
+	"github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime"
 )
 
 func TestInitManager(t *testing.T) {

cmd/postgres-operator/open_telemetry.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"path/filepath"
 
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
@@ -35,7 +36,7 @@ func initOpenTelemetry() (func(), error) {
 		options := []stdouttrace.Option{}
 
 		if filename != "" {
-			file, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
+			file, err := os.OpenFile(filepath.Clean(filename), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 			if err != nil {
 				return nil, errors.Wrap(err, "unable to open exporter file")
 			}

go.mod

@@ -1,4 +1,4 @@
-module github.com/percona/percona-postgresql-operator/v2
+module github.com/percona/percona-postgresql-operator/v3
 
 go 1.26.0
 

hack/create-todo-patch.sh

@@ -36,16 +36,19 @@ name_desc_with_todo=$(
     .spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.customTLSSecret.properties.name.description \
     "${clusters_dir}/generated/upstream.pgv2.percona.com_postgresclusters.yaml"
 )
+# shellcheck disable=SC2001
 name_desc_without_todo=$(sed 's/ TODO.*//g' <<< "${name_desc_with_todo}")
 
 # Generate a JSON patch file to update the "name" description for all applicable paths in the CRD.
+# shellcheck disable=SC2016
 python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_without_todo}" '
 	[{ op: "add", path: "/work", value: $new }] +
 	[paths(select(. == $old)) | { op: "copy", from: "/work", path: "/\(map(tostring) | join("/"))" }] +
 	[{ op: "remove", path: "/work" }]
 ' \
 	"${clusters_dir}/generated/upstream.pgv2.percona.com_postgresclusters.yaml" > "${clusters_dir}/todos.yaml"
 
+# shellcheck disable=SC2016
 python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_without_todo}" '
 	[{ op: "add", path: "/work", value: $new }] +
 	[paths(select(. == $old)) | { op: "copy", from: "/work", path: "/\(map(tostring) | join("/"))" }] +

internal/bridge/client.go

@@ -19,7 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1"
 )
 
 const defaultAPI = "https://api.crunchybridge.com"
@@ -279,7 +279,7 @@ func (c *Client) doWithBackoff(
 			request.Header = headers.Clone()
 
 			//nolint:bodyclose // This response is returned to the caller.
-			response, err = c.Client.Do(request)
+			response, err = c.Do(request)
 		}
 
 		// An error indicates there was no response from the server, and the
@@ -723,7 +723,7 @@ func (c *Client) UpdateCluster(
 ) (*ClusterApiResource, error) {
 	result := &ClusterApiResource{}
 
-	clusterbyte, err := json.Marshal(clusterRequestPayload)
+	clusterbyte, err := json.Marshal(clusterRequestPayload) //nolint:errchkjson //in case the struct changes, we would need to check the error anyway
 	if err != nil {
 		return result, err
 	}

internal/bridge/client_test.go

@@ -29,8 +29,8 @@ func TestClientBackoff(t *testing.T) {
 	client := NewClient("", "")
 	var total time.Duration
 
-	for i := 1; i <= 50 && client.Backoff.Steps > 0; i++ {
-		step := client.Backoff.Step()
+	for i := 1; i <= 50 && client.Backoff.Steps > 0; i++ { //nolint:staticcheck //test data
+		step := client.Backoff.Step() //nolint:staticcheck //test data
 		total += step
 
 		t.Logf("%02d:%20v%20v", i, step, total)
@@ -66,7 +66,7 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with one attempt, i.e. no backoff.
 		client := NewClient(server.URL, "xyz")
-		client.Backoff.Steps = 1
+		client.Backoff.Steps = 1 //nolint:staticcheck //test data
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx := context.Background()
@@ -111,8 +111,8 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with brief backoff.
 		client := NewClient(server.URL, "")
-		client.Backoff.Duration = time.Millisecond
-		client.Backoff.Steps = 5
+		client.Duration = time.Millisecond
+		client.Steps = 5
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx := context.Background()
@@ -168,8 +168,8 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with brief backoff.
 		client := NewClient(server.URL, "")
-		client.Backoff.Duration = time.Millisecond
-		client.Backoff.Steps = 5
+		client.Duration = time.Millisecond
+		client.Steps = 5
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx := context.Background()
@@ -188,8 +188,8 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with lots of brief backoff.
 		client := NewClient(server.URL, "")
-		client.Backoff.Duration = time.Millisecond
-		client.Backoff.Steps = 100
+		client.Duration = time.Millisecond
+		client.Steps = 100
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
@@ -1227,7 +1227,7 @@ func TestGetClusterRole(t *testing.T) {
 	}
 
 	t.Run("WeSendCorrectData", func(t *testing.T) {
-		responsePayloadJson, err := json.Marshal(clusterRoleApiResource)
+		responsePayloadJson, err := json.Marshal(clusterRoleApiResource) //nolint:gosec // test data, not a real secret
 		assert.NilError(t, err)
 
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -1249,7 +1249,7 @@ func TestGetClusterRole(t *testing.T) {
 	})
 
 	t.Run("OkResponse", func(t *testing.T) {
-		responsePayloadJson, err := json.Marshal(clusterRoleApiResource)
+		responsePayloadJson, err := json.Marshal(clusterRoleApiResource) //nolint:gosec // test data, not a real secret
 		assert.NilError(t, err)
 
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -1267,7 +1267,7 @@ func TestGetClusterRole(t *testing.T) {
 	})
 
 	t.Run("ErrorResponse", func(t *testing.T) {
-		responsePayloadJson, err := json.Marshal(clusterRoleApiResource)
+		responsePayloadJson, err := json.Marshal(clusterRoleApiResource) //nolint:gosec // test data, not a real secret
 		assert.NilError(t, err)
 
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

internal/bridge/crunchybridgecluster/apply.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"reflect"
 
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -22,7 +23,7 @@ func (r *CrunchyBridgeClusterReconciler) patch(
 	patch client.Patch, options ...client.PatchOption,
 ) error {
 	options = append([]client.PatchOption{r.Owner}, options...)
-	return r.Client.Patch(ctx, object, patch, options...)
+	return r.Patch(ctx, object, patch, options...)
 }
 
 // apply sends an apply patch to object's endpoint in the Kubernetes API and
@@ -36,7 +37,7 @@ func (r *CrunchyBridgeClusterReconciler) apply(ctx context.Context, object clien
 	// Generate an apply-patch by comparing the object to its zero value.
 	zero := reflect.New(reflect.TypeOf(object).Elem()).Interface()
 	data, err := client.MergeFrom(zero.(client.Object)).Data(object)
-	apply := client.RawPatch(client.Apply.Type(), data)
+	apply := client.RawPatch(types.ApplyPatchType, data)
 
 	// Send the apply-patch with force=true.
 	if err == nil {