K8SPG-862 module github.com/percona/percona-postgresql-operator/v2 (#1308)

Author: gkech

.golangci.yaml

@@ -54,7 +54,7 @@ linters:
               desc: Should be used only in tests.
             - pkg: testing/*
               desc: The "testing" packages should be used only in tests.
-            - pkg: github.com/percona/percona-postgresql-operator/internal/testing/*
+            - pkg: github.com/percona/percona-postgresql-operator/v2/internal/testing/*
               desc: The "internal/testing" packages should be used only in tests.
         tests:
           files:

Jenkinsfile

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

cmd/extension-installer/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/percona/percona-postgresql-operator/percona/extensions"
+	"github.com/percona/percona-postgresql-operator/v2/percona/extensions"
 )
 
 func main() {

cmd/postgres-operator/main.go

@@ -27,24 +27,24 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/percona/percona-postgresql-operator/internal/controller/pgupgrade"
-	"github.com/percona/percona-postgresql-operator/internal/controller/postgrescluster"
-	"github.com/percona/percona-postgresql-operator/internal/controller/runtime"
-	"github.com/percona/percona-postgresql-operator/internal/controller/standalone_pgadmin"
-	"github.com/percona/percona-postgresql-operator/internal/feature"
-	"github.com/percona/percona-postgresql-operator/internal/initialize"
-	"github.com/percona/percona-postgresql-operator/internal/logging"
-	"github.com/percona/percona-postgresql-operator/internal/naming"
-	"github.com/percona/percona-postgresql-operator/internal/upgradecheck"
-	perconaController "github.com/percona/percona-postgresql-operator/percona/controller"
-	"github.com/percona/percona-postgresql-operator/percona/controller/pgbackup"
-	"github.com/percona/percona-postgresql-operator/percona/controller/pgcluster"
-	"github.com/percona/percona-postgresql-operator/percona/controller/pgrestore"
-	perconaPGUpgrade "github.com/percona/percona-postgresql-operator/percona/controller/pgupgrade"
-	perconaRuntime "github.com/percona/percona-postgresql-operator/percona/runtime"
-	"github.com/percona/percona-postgresql-operator/percona/utils/registry"
-	v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
-	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	"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/initialize"
+	"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"
+	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"
+	perconaRuntime "github.com/percona/percona-postgresql-operator/v2/percona/runtime"
+	"github.com/percona/percona-postgresql-operator/v2/percona/utils/registry"
+	v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2"
+	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
 var (

go.mod

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

internal/bridge/client.go

@@ -20,7 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
 const defaultAPI = "https://api.crunchybridge.com"

internal/bridge/client_test.go

@@ -19,7 +19,7 @@ import (
 	"gotest.tools/v3/assert"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"github.com/percona/percona-postgresql-operator/internal/initialize"
+	"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
 )
 
 var testApiKey = "9012"

internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go

@@ -21,11 +21,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 
-	"github.com/percona/percona-postgresql-operator/internal/bridge"
-	"github.com/percona/percona-postgresql-operator/internal/controller/runtime"
-	pgoRuntime "github.com/percona/percona-postgresql-operator/internal/controller/runtime"
-	"github.com/percona/percona-postgresql-operator/internal/naming"
-	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v2/internal/bridge"
+	pgoRuntime "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
+	"github.com/percona/percona-postgresql-operator/v2/internal/naming"
+	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
 // CrunchyBridgeClusterReconciler reconciles a CrunchyBridgeCluster object
@@ -223,7 +222,7 @@ func (r *CrunchyBridgeClusterReconciler) Reconcile(ctx context.Context, req ctrl
 	// TODO(crunchybridgecluster): Do we want the operator to interrupt
 	// upgrades created through the GUI/API?
 	if len(crunchybridgecluster.Status.OngoingUpgrade) != 0 {
-		return runtime.RequeueWithoutBackoff(3 * time.Minute), nil
+		return pgoRuntime.RequeueWithoutBackoff(3 * time.Minute), nil
 	}
 
 	// Check if there's an upgrade difference for the three upgradeable fields that hit the upgrade endpoint
@@ -253,7 +252,7 @@ func (r *CrunchyBridgeClusterReconciler) Reconcile(ctx context.Context, req ctrl
 	log.Info("Reconciled")
 	// TODO(crunchybridgecluster): do we always want to requeue? Does the Watch mean we
 	// don't need this, or do we want both?
-	return runtime.RequeueWithoutBackoff(3 * time.Minute), nil
+	return pgoRuntime.RequeueWithoutBackoff(3 * time.Minute), nil
 }
 
 // reconcileBridgeConnectionSecret looks for the Bridge connection secret specified by the cluster,
@@ -403,7 +402,7 @@ func (r *CrunchyBridgeClusterReconciler) handleCreateCluster(ctx context.Context
 		Message:            "The condition of the upgrade(s) is unknown.",
 	})
 
-	return runtime.RequeueWithoutBackoff(3 * time.Minute)
+	return pgoRuntime.RequeueWithoutBackoff(3 * time.Minute)
 }
 
 // handleGetCluster handles getting the cluster details from Bridge and
@@ -564,7 +563,7 @@ func (r *CrunchyBridgeClusterReconciler) handleUpgrade(ctx context.Context,
 		})
 	}
 
-	return runtime.RequeueWithoutBackoff(3 * time.Minute)
+	return pgoRuntime.RequeueWithoutBackoff(3 * time.Minute)
 }
 
 // handleUpgradeHA handles upgrades that hit the
@@ -611,7 +610,7 @@ func (r *CrunchyBridgeClusterReconciler) handleUpgradeHA(ctx context.Context,
 		})
 	}
 
-	return runtime.RequeueWithoutBackoff(3 * time.Minute)
+	return pgoRuntime.RequeueWithoutBackoff(3 * time.Minute)
 }
 
 // handleUpdate handles upgrades that hit the "PATCH /clusters/<id>" endpoint
@@ -656,7 +655,7 @@ func (r *CrunchyBridgeClusterReconciler) handleUpdate(ctx context.Context,
 			clusterUpdate.ClusterName, *clusterUpdate.IsProtected),
 	})
 
-	return runtime.RequeueWithoutBackoff(3 * time.Minute)
+	return pgoRuntime.RequeueWithoutBackoff(3 * time.Minute)
 }
 
 // GetSecretKeys gets the secret and returns the expected API key and team id

internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go

@@ -19,12 +19,12 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/percona/percona-postgresql-operator/internal/bridge"
-	"github.com/percona/percona-postgresql-operator/internal/initialize"
-	"github.com/percona/percona-postgresql-operator/internal/naming"
-	"github.com/percona/percona-postgresql-operator/internal/testing/cmp"
-	"github.com/percona/percona-postgresql-operator/internal/testing/require"
-	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v2/internal/bridge"
+	"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
+	"github.com/percona/percona-postgresql-operator/v2/internal/naming"
+	"github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp"
+	"github.com/percona/percona-postgresql-operator/v2/internal/testing/require"
+	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
 var testTeamId = "5678"

internal/bridge/crunchybridgecluster/delete.go

@@ -11,9 +11,9 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	"github.com/percona/percona-postgresql-operator/internal/controller/runtime"
-	"github.com/percona/percona-postgresql-operator/internal/initialize"
-	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
+	"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
+	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
 const finalizer = "crunchybridgecluster.postgres-operator.crunchydata.com/finalizer"