diff --git a/cmd/main.go b/cmd/main.go index adbf0cce5..3d65b9c50 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,9 +10,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/zalando/postgres-operator/pkg/controller" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/controller" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" ) var ( diff --git a/go.mod b/go.mod index 8e8d27f78..5c0a6408b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/zalando/postgres-operator +module github.com/zalando/postgres-operator/v2 go 1.26.4 diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index fa3efb599..d652e87e7 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail SRC="github.com" -GOPKG="$SRC/zalando/postgres-operator" +GOPKG="$SRC/zalando/postgres-operator/v2" CUSTOM_RESOURCE_NAME_ZAL="zalando.org" CUSTOM_RESOURCE_NAME_ACID="acid.zalan.do" CUSTOM_RESOURCE_VERSION="v1" diff --git a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go index e83787f6d..024168b05 100644 --- a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go +++ b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go @@ -3,9 +3,9 @@ package v1 // Operator configuration CRD definition, please use snake_case for field names. import ( - "github.com/zalando/postgres-operator/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/spec" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/acid.zalan.do/v1/register.go b/pkg/apis/acid.zalan.do/v1/register.go index 9dcbf2baf..5c260416f 100644 --- a/pkg/apis/acid.zalan.do/v1/register.go +++ b/pkg/apis/acid.zalan.do/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - acidzalando "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do" + acidzalando "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go index 2a3fefd00..9f5e93976 100644 --- a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go +++ b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go @@ -28,7 +28,7 @@ SOFTWARE. package v1 import ( - config "github.com/zalando/postgres-operator/pkg/util/config" + config "github.com/zalando/postgres-operator/v2/pkg/util/config" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apis/zalando.org/v1/fabriceventstream.go b/pkg/apis/zalando.org/v1/fabriceventstream.go index cb2ccdef5..d2d4a01df 100644 --- a/pkg/apis/zalando.org/v1/fabriceventstream.go +++ b/pkg/apis/zalando.org/v1/fabriceventstream.go @@ -1,7 +1,7 @@ package v1 import ( - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/zalando.org/v1/register.go b/pkg/apis/zalando.org/v1/register.go index 33a2c718b..289aa1701 100644 --- a/pkg/apis/zalando.org/v1/register.go +++ b/pkg/apis/zalando.org/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/zalando/postgres-operator/pkg/apis/zalando.org" + "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 97e389970..14d2f0cc0 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -12,10 +12,10 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/zalando/postgres-operator/pkg/cluster" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" ) const ( diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index cb5b2a839..d65aae20d 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -14,20 +14,20 @@ import ( "time" "github.com/sirupsen/logrus" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" - "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" - "github.com/zalando/postgres-operator/pkg/spec" - pgteams "github.com/zalando/postgres-operator/pkg/teams" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/patroni" - "github.com/zalando/postgres-operator/pkg/util/teams" - "github.com/zalando/postgres-operator/pkg/util/users" - "github.com/zalando/postgres-operator/pkg/util/volumes" + "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" + "github.com/zalando/postgres-operator/v2/pkg/spec" + pgteams "github.com/zalando/postgres-operator/v2/pkg/teams" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/pkg/util/teams" + "github.com/zalando/postgres-operator/v2/pkg/util/users" + "github.com/zalando/postgres-operator/v2/pkg/util/volumes" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go index d651bea12..6c058498b 100644 --- a/pkg/cluster/cluster_test.go +++ b/pkg/cluster/cluster_test.go @@ -11,15 +11,15 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/patroni" - "github.com/zalando/postgres-operator/pkg/util/teams" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + fakeacidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/fake" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/pkg/util/teams" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/cluster/connection_pooler.go b/pkg/cluster/connection_pooler.go index 15e6a52cc..6a2539557 100644 --- a/pkg/cluster/connection_pooler.go +++ b/pkg/cluster/connection_pooler.go @@ -10,8 +10,8 @@ import ( "github.com/r3labs/diff" "github.com/sirupsen/logrus" - acidzalando "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidzalando "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19,11 +19,11 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" ) var poolerRunAsUser = int64(100) diff --git a/pkg/cluster/connection_pooler_test.go b/pkg/cluster/connection_pooler_test.go index e73a4b098..030438910 100644 --- a/pkg/cluster/connection_pooler_test.go +++ b/pkg/cluster/connection_pooler_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + fakeacidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/fake" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/cluster/database.go b/pkg/cluster/database.go index 56b5f3638..d46dc6067 100644 --- a/pkg/cluster/database.go +++ b/pkg/cluster/database.go @@ -11,10 +11,10 @@ import ( "github.com/lib/pq" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/retryutil" - "github.com/zalando/postgres-operator/pkg/util/users" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" + "github.com/zalando/postgres-operator/v2/pkg/util/users" ) const ( diff --git a/pkg/cluster/exec.go b/pkg/cluster/exec.go index 5605a70f6..5ba016ef1 100644 --- a/pkg/cluster/exec.go +++ b/pkg/cluster/exec.go @@ -11,8 +11,8 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/remotecommand" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" ) // ExecCommand executes arbitrary command inside the pod diff --git a/pkg/cluster/filesystems.go b/pkg/cluster/filesystems.go index a34e5a90e..f1b711499 100644 --- a/pkg/cluster/filesystems.go +++ b/pkg/cluster/filesystems.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/filesystems" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/filesystems" ) func (c *Cluster) getPostgresFilesystemInfo(podName *spec.NamespacedName) (device, fstype string, err error) { diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 86d14f17b..7ed3cd4d6 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -24,14 +24,14 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/patroni" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" ) const ( diff --git a/pkg/cluster/k8sres_test.go b/pkg/cluster/k8sres_test.go index 013b09c07..6cb0e085c 100644 --- a/pkg/cluster/k8sres_test.go +++ b/pkg/cluster/k8sres_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + fakeacidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/fake" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index 6995c50b5..dae5db2e8 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/Masterminds/semver/v3" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go index c18054aad..2ce53b1ae 100644 --- a/pkg/cluster/pod.go +++ b/pkg/cluster/pod.go @@ -13,11 +13,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/patroni" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" ) func (c *Cluster) listPods() ([]v1.Pod, error) { diff --git a/pkg/cluster/pod_test.go b/pkg/cluster/pod_test.go index 0eb1791e2..0123cce45 100644 --- a/pkg/cluster/pod_test.go +++ b/pkg/cluster/pod_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/golang/mock/gomock" - "github.com/zalando/postgres-operator/mocks" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/mocks" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/cluster/resources.go b/pkg/cluster/resources.go index 6053de471..d862de2c6 100644 --- a/pkg/cluster/resources.go +++ b/pkg/cluster/resources.go @@ -13,9 +13,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" ) const ( diff --git a/pkg/cluster/streams.go b/pkg/cluster/streams.go index bf9be3fb4..575b4f6b9 100644 --- a/pkg/cluster/streams.go +++ b/pkg/cluster/streams.go @@ -8,11 +8,11 @@ import ( "sort" "strings" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/cluster/streams_test.go b/pkg/cluster/streams_test.go index 934f2bfd4..9ea25e49d 100644 --- a/pkg/cluster/streams_test.go +++ b/pkg/cluster/streams_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/stretchr/testify/assert" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" - fakezalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" + fakezalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/fake" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index 6e9f9348a..664c67b7e 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -12,11 +12,11 @@ import ( "strings" "time" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" policyv1 "k8s.io/api/policy/v1" diff --git a/pkg/cluster/sync_test.go b/pkg/cluster/sync_test.go index 1d21d1536..1c705ea44 100644 --- a/pkg/cluster/sync_test.go +++ b/pkg/cluster/sync_test.go @@ -20,15 +20,15 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - "github.com/zalando/postgres-operator/mocks" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/mocks" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + fakeacidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/fake" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" "k8s.io/client-go/kubernetes/fake" ) diff --git a/pkg/cluster/types.go b/pkg/cluster/types.go index 17c4e705e..06c1674e3 100644 --- a/pkg/cluster/types.go +++ b/pkg/cluster/types.go @@ -3,7 +3,7 @@ package cluster import ( "time" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" policyv1 "k8s.io/api/policy/v1" diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go index c2a847ba4..bc452c22d 100644 --- a/pkg/cluster/util.go +++ b/pkg/cluster/util.go @@ -20,14 +20,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "github.com/sirupsen/logrus" - acidzalando "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/nicediff" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + acidzalando "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/nicediff" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" ) // OAuthTokenGetter provides the method for fetching OAuth tokens diff --git a/pkg/cluster/util_test.go b/pkg/cluster/util_test.go index dfae6237a..9fc8cd551 100644 --- a/pkg/cluster/util_test.go +++ b/pkg/cluster/util_test.go @@ -13,13 +13,13 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/zalando/postgres-operator/mocks" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/patroni" + "github.com/zalando/postgres-operator/v2/mocks" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + fakeacidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/fake" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/patroni" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/cluster/volumes.go b/pkg/cluster/volumes.go index e4451a12c..653a05aed 100644 --- a/pkg/cluster/volumes.go +++ b/pkg/cluster/volumes.go @@ -11,11 +11,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/filesystems" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/volumes" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/filesystems" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/volumes" ) func (c *Cluster) syncVolumes() error { diff --git a/pkg/cluster/volumes_test.go b/pkg/cluster/volumes_test.go index 51ac92e06..66b081edf 100644 --- a/pkg/cluster/volumes_test.go +++ b/pkg/cluster/volumes_test.go @@ -14,12 +14,12 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/zalando/postgres-operator/mocks" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/volumes" + "github.com/zalando/postgres-operator/v2/mocks" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/volumes" "k8s.io/client-go/kubernetes/fake" ) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 63434efed..0d4638318 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -11,17 +11,17 @@ import ( "time" "github.com/sirupsen/logrus" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/apiserver" - "github.com/zalando/postgres-operator/pkg/cluster" - acidv1informer "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/teams" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/ringlog" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/apiserver" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + acidv1informer "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/teams" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/ringlog" v1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/logs_and_api.go b/pkg/controller/logs_and_api.go index 24881f9d7..49b9138af 100644 --- a/pkg/controller/logs_and_api.go +++ b/pkg/controller/logs_and_api.go @@ -7,10 +7,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/zalando/postgres-operator/pkg/cluster" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/node.go b/pkg/controller/node.go index 978fda130..d962190be 100644 --- a/pkg/controller/node.go +++ b/pkg/controller/node.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "github.com/zalando/postgres-operator/pkg/cluster" - "github.com/zalando/postgres-operator/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + "github.com/zalando/postgres-operator/v2/pkg/util" ) func (c *Controller) nodeAdd(obj interface{}) { diff --git a/pkg/controller/node_test.go b/pkg/controller/node_test.go index a9616e256..b9326d9ef 100644 --- a/pkg/controller/node_test.go +++ b/pkg/controller/node_test.go @@ -3,7 +3,7 @@ package controller import ( "testing" - "github.com/zalando/postgres-operator/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/spec" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 80e25e65f..b34707057 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go index 1aaa307ea..f3d1c882d 100644 --- a/pkg/controller/pod.go +++ b/pkg/controller/pod.go @@ -3,9 +3,9 @@ package controller import ( v1 "k8s.io/api/core/v1" - "github.com/zalando/postgres-operator/pkg/cluster" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/postgresql.go b/pkg/controller/postgresql.go index e6f04fe6b..d2c7b535f 100644 --- a/pkg/controller/postgresql.go +++ b/pkg/controller/postgresql.go @@ -17,12 +17,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/cluster" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" - "github.com/zalando/postgres-operator/pkg/util/ringlog" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/util/ringlog" ) func (c *Controller) clusterResync(stopCh <-chan struct{}, wg *sync.WaitGroup) { diff --git a/pkg/controller/postgresql_test.go b/pkg/controller/postgresql_test.go index e6645e188..68dea4bd9 100644 --- a/pkg/controller/postgresql_test.go +++ b/pkg/controller/postgresql_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/spec" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/types.go b/pkg/controller/types.go index b598014c9..b70feaae7 100644 --- a/pkg/controller/types.go +++ b/pkg/controller/types.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/types" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" ) // EventType contains type of the events for the TPRs and Pods received from Kubernetes diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 6296e5341..eeacfac10 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -10,12 +10,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/cluster" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/cluster" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" "gopkg.in/yaml.v3" ) diff --git a/pkg/controller/util_test.go b/pkg/controller/util_test.go index 4c3a9b356..c07e7f44b 100644 --- a/pkg/controller/util_test.go +++ b/pkg/controller/util_test.go @@ -8,9 +8,9 @@ import ( b64 "encoding/base64" "github.com/stretchr/testify/assert" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/config" - "github.com/zalando/postgres-operator/pkg/util/k8sutil" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/config" + "github.com/zalando/postgres-operator/v2/pkg/util/k8sutil" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index e2a14718a..15d96814e 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -28,8 +28,8 @@ import ( fmt "fmt" http "net/http" - acidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/zalando.org/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/zalando.org/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index f7f61ddea..c66937564 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -25,11 +25,11 @@ SOFTWARE. package fake import ( - clientset "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - acidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" - fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake" - zalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/zalando.org/v1" - fakezalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake" + clientset "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + fakeacidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/zalando.org/v1" + fakezalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index d6bf8f312..4a7d8fda3 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -25,8 +25,8 @@ SOFTWARE. package fake import ( - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index 45a31ab41..99f2f2ff4 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -25,8 +25,8 @@ SOFTWARE. package scheme import ( - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/acid.zalan.do_client.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/acid.zalan.do_client.go index 93564ec3b..648af313c 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/acid.zalan.do_client.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/acid.zalan.do_client.go @@ -27,8 +27,8 @@ package v1 import ( http "net/http" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - scheme "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + scheme "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_acid.zalan.do_client.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_acid.zalan.do_client.go index 643b8fd26..4dad7e508 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_acid.zalan.do_client.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_acid.zalan.do_client.go @@ -25,7 +25,7 @@ SOFTWARE. package fake import ( - v1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_operatorconfiguration.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_operatorconfiguration.go index 66db8ec40..144b72938 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_operatorconfiguration.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_operatorconfiguration.go @@ -25,8 +25,8 @@ SOFTWARE. package fake import ( - v1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresql.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresql.go index b2ac1e9e1..1daddb088 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresql.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresql.go @@ -25,8 +25,8 @@ SOFTWARE. package fake import ( - v1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresteam.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresteam.go index 3067aac18..0ab34eccc 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresteam.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresteam.go @@ -25,8 +25,8 @@ SOFTWARE. package fake import ( - v1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/operatorconfiguration.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/operatorconfiguration.go index 292fa2fce..bbee66241 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/operatorconfiguration.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/operatorconfiguration.go @@ -27,8 +27,8 @@ package v1 import ( context "context" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - scheme "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + scheme "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresql.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresql.go index 75793c57a..3ec5fe19a 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresql.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresql.go @@ -27,8 +27,8 @@ package v1 import ( context "context" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - scheme "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + scheme "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresteam.go b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresteam.go index 99df6b6cc..9cca69db7 100644 --- a/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresteam.go +++ b/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/postgresteam.go @@ -27,8 +27,8 @@ package v1 import ( context "context" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - scheme "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + scheme "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/zalando.org/v1/fabriceventstream.go b/pkg/generated/clientset/versioned/typed/zalando.org/v1/fabriceventstream.go index 2681ac467..620c89f7e 100644 --- a/pkg/generated/clientset/versioned/typed/zalando.org/v1/fabriceventstream.go +++ b/pkg/generated/clientset/versioned/typed/zalando.org/v1/fabriceventstream.go @@ -27,8 +27,8 @@ package v1 import ( context "context" - zalandoorgv1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" - scheme "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" + zalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" + scheme "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_fabriceventstream.go b/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_fabriceventstream.go index c3ae49663..95d978e61 100644 --- a/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_fabriceventstream.go +++ b/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_fabriceventstream.go @@ -25,8 +25,8 @@ SOFTWARE. package fake import ( - v1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" - zalandoorgv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/zalando.org/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" + zalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/zalando.org/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_zalando.org_client.go b/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_zalando.org_client.go index 588a2bb94..b3b4b0488 100644 --- a/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_zalando.org_client.go +++ b/pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_zalando.org_client.go @@ -25,7 +25,7 @@ SOFTWARE. package fake import ( - v1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/zalando.org/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/zalando.org/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/generated/clientset/versioned/typed/zalando.org/v1/zalando.org_client.go b/pkg/generated/clientset/versioned/typed/zalando.org/v1/zalando.org_client.go index 803aee179..6751be27a 100644 --- a/pkg/generated/clientset/versioned/typed/zalando.org/v1/zalando.org_client.go +++ b/pkg/generated/clientset/versioned/typed/zalando.org/v1/zalando.org_client.go @@ -27,8 +27,8 @@ package v1 import ( http "net/http" - zalandoorgv1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" - scheme "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/scheme" + zalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" + scheme "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/generated/informers/externalversions/acid.zalan.do/interface.go b/pkg/generated/informers/externalversions/acid.zalan.do/interface.go index a75e6ae2b..6c41921dc 100644 --- a/pkg/generated/informers/externalversions/acid.zalan.do/interface.go +++ b/pkg/generated/informers/externalversions/acid.zalan.do/interface.go @@ -25,8 +25,8 @@ SOFTWARE. package acid import ( - v1 "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/acid.zalan.do/v1" - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" + v1 "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/acid.zalan.do/v1" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informers/externalversions/acid.zalan.do/v1/interface.go b/pkg/generated/informers/externalversions/acid.zalan.do/v1/interface.go index d176a2b35..766fa193a 100644 --- a/pkg/generated/informers/externalversions/acid.zalan.do/v1/interface.go +++ b/pkg/generated/informers/externalversions/acid.zalan.do/v1/interface.go @@ -25,7 +25,7 @@ SOFTWARE. package v1 import ( - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/generated/informers/externalversions/acid.zalan.do/v1/operatorconfiguration.go b/pkg/generated/informers/externalversions/acid.zalan.do/v1/operatorconfiguration.go index e2fee1a4e..d3d8f729e 100644 --- a/pkg/generated/informers/externalversions/acid.zalan.do/v1/operatorconfiguration.go +++ b/pkg/generated/informers/externalversions/acid.zalan.do/v1/operatorconfiguration.go @@ -28,10 +28,10 @@ import ( context "context" time "time" - apisacidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - versioned "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/generated/listers/acid.zalan.do/v1" + apisacidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + versioned "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/listers/acid.zalan.do/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresql.go b/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresql.go index c1b58ff05..0d16ba6ac 100644 --- a/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresql.go +++ b/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresql.go @@ -28,10 +28,10 @@ import ( context "context" time "time" - apisacidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - versioned "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/generated/listers/acid.zalan.do/v1" + apisacidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + versioned "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/listers/acid.zalan.do/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresteam.go b/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresteam.go index 954dfd19f..12ec74fe1 100644 --- a/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresteam.go +++ b/pkg/generated/informers/externalversions/acid.zalan.do/v1/postgresteam.go @@ -28,10 +28,10 @@ import ( context "context" time "time" - apisacidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - versioned "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" - acidzalandov1 "github.com/zalando/postgres-operator/pkg/generated/listers/acid.zalan.do/v1" + apisacidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + versioned "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/listers/acid.zalan.do/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index fb9ba76ac..22f6a5ebd 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -30,10 +30,10 @@ import ( sync "sync" time "time" - versioned "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - acidzalando "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/acid.zalan.do" - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" - zalandoorg "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/zalando.org" + versioned "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + acidzalando "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/acid.zalan.do" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" + zalandoorg "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/zalando.org" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index f5953bde6..7c723d958 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -27,8 +27,8 @@ package externalversions import ( fmt "fmt" - v1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandoorgv1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" + v1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index b8c3e7e51..bfb9af868 100644 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -27,7 +27,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" + versioned "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/informers/externalversions/zalando.org/interface.go b/pkg/generated/informers/externalversions/zalando.org/interface.go index a05b7ea7d..e1bdb3234 100644 --- a/pkg/generated/informers/externalversions/zalando.org/interface.go +++ b/pkg/generated/informers/externalversions/zalando.org/interface.go @@ -25,8 +25,8 @@ SOFTWARE. package zalando import ( - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/zalando.org/v1" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" + v1 "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/zalando.org/v1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informers/externalversions/zalando.org/v1/fabriceventstream.go b/pkg/generated/informers/externalversions/zalando.org/v1/fabriceventstream.go index 675058f80..f95629734 100644 --- a/pkg/generated/informers/externalversions/zalando.org/v1/fabriceventstream.go +++ b/pkg/generated/informers/externalversions/zalando.org/v1/fabriceventstream.go @@ -28,10 +28,10 @@ import ( context "context" time "time" - apiszalandoorgv1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" - versioned "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" - zalandoorgv1 "github.com/zalando/postgres-operator/pkg/generated/listers/zalando.org/v1" + apiszalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" + versioned "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" + zalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/generated/listers/zalando.org/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/zalando.org/v1/interface.go b/pkg/generated/informers/externalversions/zalando.org/v1/interface.go index 825e5f4a4..95207079c 100644 --- a/pkg/generated/informers/externalversions/zalando.org/v1/interface.go +++ b/pkg/generated/informers/externalversions/zalando.org/v1/interface.go @@ -25,7 +25,7 @@ SOFTWARE. package v1 import ( - internalinterfaces "github.com/zalando/postgres-operator/pkg/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/zalando/postgres-operator/v2/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/generated/listers/acid.zalan.do/v1/operatorconfiguration.go b/pkg/generated/listers/acid.zalan.do/v1/operatorconfiguration.go index c00599718..e52c8f50a 100644 --- a/pkg/generated/listers/acid.zalan.do/v1/operatorconfiguration.go +++ b/pkg/generated/listers/acid.zalan.do/v1/operatorconfiguration.go @@ -25,7 +25,7 @@ SOFTWARE. package v1 import ( - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/acid.zalan.do/v1/postgresql.go b/pkg/generated/listers/acid.zalan.do/v1/postgresql.go index b2fe09749..0f9849e28 100644 --- a/pkg/generated/listers/acid.zalan.do/v1/postgresql.go +++ b/pkg/generated/listers/acid.zalan.do/v1/postgresql.go @@ -25,7 +25,7 @@ SOFTWARE. package v1 import ( - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/acid.zalan.do/v1/postgresteam.go b/pkg/generated/listers/acid.zalan.do/v1/postgresteam.go index 74fcc81d0..e5736b816 100644 --- a/pkg/generated/listers/acid.zalan.do/v1/postgresteam.go +++ b/pkg/generated/listers/acid.zalan.do/v1/postgresteam.go @@ -25,7 +25,7 @@ SOFTWARE. package v1 import ( - acidzalandov1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidzalandov1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/zalando.org/v1/fabriceventstream.go b/pkg/generated/listers/zalando.org/v1/fabriceventstream.go index 25e57e56e..a8ac77e5a 100644 --- a/pkg/generated/listers/zalando.org/v1/fabriceventstream.go +++ b/pkg/generated/listers/zalando.org/v1/fabriceventstream.go @@ -25,7 +25,7 @@ SOFTWARE. package v1 import ( - zalandoorgv1 "github.com/zalando/postgres-operator/pkg/apis/zalando.org/v1" + zalandoorgv1 "github.com/zalando/postgres-operator/v2/pkg/apis/zalando.org/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/teams/postgres_team.go b/pkg/teams/postgres_team.go index b682585ab..e241ee78a 100644 --- a/pkg/teams/postgres_team.go +++ b/pkg/teams/postgres_team.go @@ -1,8 +1,8 @@ package teams import ( - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/util" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/util" ) // PostgresTeamMap is the operator's internal representation of all PostgresTeam CRDs diff --git a/pkg/teams/postgres_team_test.go b/pkg/teams/postgres_team_test.go index fe45ade05..23694532d 100644 --- a/pkg/teams/postgres_team_test.go +++ b/pkg/teams/postgres_team_test.go @@ -3,8 +3,8 @@ package teams import ( "testing" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - "github.com/zalando/postgres-operator/pkg/util" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + "github.com/zalando/postgres-operator/v2/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index d51a1fbf4..c89945f27 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -6,8 +6,8 @@ import ( "fmt" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/util/filesystems/ext234.go b/pkg/util/filesystems/ext234.go index fcd4053fc..ed37d5910 100644 --- a/pkg/util/filesystems/ext234.go +++ b/pkg/util/filesystems/ext234.go @@ -17,7 +17,7 @@ const ( resize2fs = "resize2fs" ) -//Ext234Resize implements the FilesystemResizer interface for the ext4/3/2fs. +// Ext234Resize implements the FilesystemResizer interface for the ext4/3/2fs. type Ext234Resize struct { } diff --git a/pkg/util/k8sutil/k8sutil.go b/pkg/util/k8sutil/k8sutil.go index 8515027ab..62248ce49 100644 --- a/pkg/util/k8sutil/k8sutil.go +++ b/pkg/util/k8sutil/k8sutil.go @@ -7,11 +7,11 @@ import ( b64 "encoding/base64" "encoding/json" - apiacidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" - zalandoclient "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned" - acidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" - zalandov1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/typed/zalando.org/v1" - "github.com/zalando/postgres-operator/pkg/spec" + apiacidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" + zalandoclient "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/acid.zalan.do/v1" + zalandov1 "github.com/zalando/postgres-operator/v2/pkg/generated/clientset/versioned/typed/zalando.org/v1" + "github.com/zalando/postgres-operator/v2/pkg/spec" apiappsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/pkg/util/patroni/patroni.go b/pkg/util/patroni/patroni.go index 2129f1acc..36648ce77 100644 --- a/pkg/util/patroni/patroni.go +++ b/pkg/util/patroni/patroni.go @@ -11,11 +11,11 @@ import ( "strconv" "time" - "github.com/zalando/postgres-operator/pkg/util/constants" - httpclient "github.com/zalando/postgres-operator/pkg/util/httpclient" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + httpclient "github.com/zalando/postgres-operator/v2/pkg/util/httpclient" "github.com/sirupsen/logrus" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/util/patroni/patroni_test.go b/pkg/util/patroni/patroni_test.go index 39b498d2e..cd72ea877 100644 --- a/pkg/util/patroni/patroni_test.go +++ b/pkg/util/patroni/patroni_test.go @@ -12,9 +12,9 @@ import ( "github.com/golang/mock/gomock" "github.com/sirupsen/logrus" - "github.com/zalando/postgres-operator/mocks" + "github.com/zalando/postgres-operator/v2/mocks" - acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" + acidv1 "github.com/zalando/postgres-operator/v2/pkg/apis/acid.zalan.do/v1" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/util/teams/teams_test.go b/pkg/util/teams/teams_test.go index da9f497c1..ecf22a4e3 100644 --- a/pkg/util/teams/teams_test.go +++ b/pkg/util/teams/teams_test.go @@ -1,243 +1,243 @@ -package teams - -import ( - "fmt" - "net/http" - "net/http/httptest" - "reflect" - "testing" - - "github.com/sirupsen/logrus" -) - -var ( - logger = logrus.New().WithField("pkg", "teamsapi") - token = "ec45b1cfbe7100c6315d183a3eb6cec0M2U1LWJkMzEtZDgzNzNmZGQyNGM3IiwiYXV0aF90aW1lIjoxNDkzNzMwNzQ1LCJpc3MiOiJodHRwcz" - input = `{ - "dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", - "id": "acid", - "id_name": "acid", - "team_id": "111222", - "type": "official", - "name": "Acid team name", - "mail": [ - "email1@example.com", - "email2@example.com" - ], - "alias": [ - "acid" - ], - "member": [ - "member1", - "member2", - "member3" - ], - "infrastructure-accounts": [ - { - "id": "1234512345", - "name": "acid", - "provider": "aws", - "type": "aws", - "description": "", - "owner": "acid", - "owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", - "disabled": false - }, - { - "id": "5432154321", - "name": "db", - "provider": "aws", - "type": "aws", - "description": "", - "owner": "acid", - "owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", - "disabled": false - } - ], - "cost_center": "00099999", - "delivery_lead": "member4", - "parent_team_id": "111221" - }` -) -var teamsAPItc = []struct { - in string - inCode int - inTeam string - out *Team - err error -}{ - { - input, - 200, - "acid", - &Team{ - Dn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", - ID: "acid", - TeamName: "acid", - TeamID: "111222", - Type: "official", - FullName: "Acid team name", - Aliases: []string{"acid"}, - Mails: []string{"email1@example.com", "email2@example.com"}, - Members: []string{"member1", "member2", "member3"}, - CostCenter: "00099999", - DeliveryLead: "member4", - ParentTeamID: "111221", - InfrastructureAccounts: []infrastructureAccount{ - { - ID: "1234512345", - Name: "acid", - Provider: "aws", - Type: "aws", - Description: "", - Owner: "acid", - OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", - Disabled: false}, - { - ID: "5432154321", - Name: "db", - Provider: "aws", - Type: "aws", - Description: "", - Owner: "acid", - OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", - Disabled: false}, - }, - }, - nil}, { - `{"error": "Access Token not valid"}`, - 401, - "acid", - nil, - fmt.Errorf(`team API query failed with status code 401 and message: '"Access Token not valid"'`), - }, - { - `{"status": "I'm a teapot'"}`, - 418, - "acid", - nil, - fmt.Errorf(`team API query failed with status code 418`), - }, - { - `{"status": "I'm a teapot`, - 418, - "acid", - nil, - fmt.Errorf(`team API query failed with status code 418 and malformed response: unexpected EOF`), - }, - { - `{"status": "I'm a teapot`, - 200, - "acid", - nil, - fmt.Errorf(`could not parse team API response: unexpected EOF`), - }, - { - input, - 404, - "banana", - nil, - fmt.Errorf(`team API query failed with status code 404`), - }, -} - -var requestsURLtc = []struct { - url string - err error -}{ - { - "coffee://localhost/", - fmt.Errorf(`Get "coffee://localhost/teams/acid": unsupported protocol scheme "coffee"`), - }, - { - "http://192.168.0.%31/", - fmt.Errorf(`parse "http://192.168.0.%%31/teams/acid": invalid URL escape "%%31"`), - }, -} - -func TestInfo(t *testing.T) { - for _, tc := range teamsAPItc { - func() { - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.Header.Get("Authorization") != "Bearer "+token { - t.Errorf("authorization token is wrong or not provided") - } - w.WriteHeader(tc.inCode) - if _, err := fmt.Fprint(w, tc.in); err != nil { - t.Errorf("error writing teams api response %v", err) - } - })) - defer ts.Close() - api := NewTeamsAPI(ts.URL, logger) - - actual, statusCode, err := api.TeamInfo(tc.inTeam, token) - if err != nil && err.Error() != tc.err.Error() { - t.Errorf("expected error: %v, got: %v", tc.err, err) - return - } - - if !reflect.DeepEqual(actual, tc.out) { - t.Errorf("expected %#v, got: %#v", tc.out, actual) - } - - if statusCode != tc.inCode { - t.Errorf("expected %d, got: %d", tc.inCode, statusCode) - } - }() - } -} - -type mockHTTPClient struct { -} - -type mockBody struct { -} - -func (b *mockBody) Read(p []byte) (n int, err error) { - return 2, nil -} - -func (b *mockBody) Close() error { - return fmt.Errorf("close error") -} - -func (c *mockHTTPClient) Do(req *http.Request) (*http.Response, error) { - resp := http.Response{ - Status: "200 OK", - StatusCode: 200, - ContentLength: 2, - Close: false, - Request: req, - } - resp.Body = &mockBody{} - - return &resp, nil -} - -func TestHttpClientClose(t *testing.T) { - ts := httptest.NewServer(nil) - - api := NewTeamsAPI(ts.URL, logger) - api.httpClient = &mockHTTPClient{} - - _, _, err := api.TeamInfo("acid", token) - expError := fmt.Errorf("error when closing response: close error") - if err.Error() != expError.Error() { - t.Errorf("expected error: %v, got: %v", expError, err) - } -} - -func TestRequest(t *testing.T) { - for _, tc := range requestsURLtc { - api := NewTeamsAPI(tc.url, logger) - resp, _, err := api.TeamInfo("acid", token) - if resp != nil { - t.Errorf("response expected to be nil") - continue - } - - if err.Error() != tc.err.Error() { - t.Errorf("expected error: %v, got: %v", tc.err, err) - } - } -} +package teams + +import ( + "fmt" + "net/http" + "net/http/httptest" + "reflect" + "testing" + + "github.com/sirupsen/logrus" +) + +var ( + logger = logrus.New().WithField("pkg", "teamsapi") + token = "ec45b1cfbe7100c6315d183a3eb6cec0M2U1LWJkMzEtZDgzNzNmZGQyNGM3IiwiYXV0aF90aW1lIjoxNDkzNzMwNzQ1LCJpc3MiOiJodHRwcz" + input = `{ + "dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", + "id": "acid", + "id_name": "acid", + "team_id": "111222", + "type": "official", + "name": "Acid team name", + "mail": [ + "email1@example.com", + "email2@example.com" + ], + "alias": [ + "acid" + ], + "member": [ + "member1", + "member2", + "member3" + ], + "infrastructure-accounts": [ + { + "id": "1234512345", + "name": "acid", + "provider": "aws", + "type": "aws", + "description": "", + "owner": "acid", + "owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", + "disabled": false + }, + { + "id": "5432154321", + "name": "db", + "provider": "aws", + "type": "aws", + "description": "", + "owner": "acid", + "owner_dn": "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", + "disabled": false + } + ], + "cost_center": "00099999", + "delivery_lead": "member4", + "parent_team_id": "111221" + }` +) +var teamsAPItc = []struct { + in string + inCode int + inTeam string + out *Team + err error +}{ + { + input, + 200, + "acid", + &Team{ + Dn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", + ID: "acid", + TeamName: "acid", + TeamID: "111222", + Type: "official", + FullName: "Acid team name", + Aliases: []string{"acid"}, + Mails: []string{"email1@example.com", "email2@example.com"}, + Members: []string{"member1", "member2", "member3"}, + CostCenter: "00099999", + DeliveryLead: "member4", + ParentTeamID: "111221", + InfrastructureAccounts: []infrastructureAccount{ + { + ID: "1234512345", + Name: "acid", + Provider: "aws", + Type: "aws", + Description: "", + Owner: "acid", + OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", + Disabled: false}, + { + ID: "5432154321", + Name: "db", + Provider: "aws", + Type: "aws", + Description: "", + Owner: "acid", + OwnerDn: "cn=100100,ou=official,ou=foobar,dc=zalando,dc=net", + Disabled: false}, + }, + }, + nil}, { + `{"error": "Access Token not valid"}`, + 401, + "acid", + nil, + fmt.Errorf(`team API query failed with status code 401 and message: '"Access Token not valid"'`), + }, + { + `{"status": "I'm a teapot'"}`, + 418, + "acid", + nil, + fmt.Errorf(`team API query failed with status code 418`), + }, + { + `{"status": "I'm a teapot`, + 418, + "acid", + nil, + fmt.Errorf(`team API query failed with status code 418 and malformed response: unexpected EOF`), + }, + { + `{"status": "I'm a teapot`, + 200, + "acid", + nil, + fmt.Errorf(`could not parse team API response: unexpected EOF`), + }, + { + input, + 404, + "banana", + nil, + fmt.Errorf(`team API query failed with status code 404`), + }, +} + +var requestsURLtc = []struct { + url string + err error +}{ + { + "coffee://localhost/", + fmt.Errorf(`Get "coffee://localhost/teams/acid": unsupported protocol scheme "coffee"`), + }, + { + "http://192.168.0.%31/", + fmt.Errorf(`parse "http://192.168.0.%%31/teams/acid": invalid URL escape "%%31"`), + }, +} + +func TestInfo(t *testing.T) { + for _, tc := range teamsAPItc { + func() { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.Header.Get("Authorization") != "Bearer "+token { + t.Errorf("authorization token is wrong or not provided") + } + w.WriteHeader(tc.inCode) + if _, err := fmt.Fprint(w, tc.in); err != nil { + t.Errorf("error writing teams api response %v", err) + } + })) + defer ts.Close() + api := NewTeamsAPI(ts.URL, logger) + + actual, statusCode, err := api.TeamInfo(tc.inTeam, token) + if err != nil && err.Error() != tc.err.Error() { + t.Errorf("expected error: %v, got: %v", tc.err, err) + return + } + + if !reflect.DeepEqual(actual, tc.out) { + t.Errorf("expected %#v, got: %#v", tc.out, actual) + } + + if statusCode != tc.inCode { + t.Errorf("expected %d, got: %d", tc.inCode, statusCode) + } + }() + } +} + +type mockHTTPClient struct { +} + +type mockBody struct { +} + +func (b *mockBody) Read(p []byte) (n int, err error) { + return 2, nil +} + +func (b *mockBody) Close() error { + return fmt.Errorf("close error") +} + +func (c *mockHTTPClient) Do(req *http.Request) (*http.Response, error) { + resp := http.Response{ + Status: "200 OK", + StatusCode: 200, + ContentLength: 2, + Close: false, + Request: req, + } + resp.Body = &mockBody{} + + return &resp, nil +} + +func TestHttpClientClose(t *testing.T) { + ts := httptest.NewServer(nil) + + api := NewTeamsAPI(ts.URL, logger) + api.httpClient = &mockHTTPClient{} + + _, _, err := api.TeamInfo("acid", token) + expError := fmt.Errorf("error when closing response: close error") + if err.Error() != expError.Error() { + t.Errorf("expected error: %v, got: %v", expError, err) + } +} + +func TestRequest(t *testing.T) { + for _, tc := range requestsURLtc { + api := NewTeamsAPI(tc.url, logger) + resp, _, err := api.TeamInfo("acid", token) + if resp != nil { + t.Errorf("response expected to be nil") + continue + } + + if err.Error() != tc.err.Error() { + t.Errorf("expected error: %v, got: %v", tc.err, err) + } + } +} diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go index b3b60df04..02130fb23 100644 --- a/pkg/util/users/users.go +++ b/pkg/util/users/users.go @@ -7,9 +7,9 @@ import ( "reflect" - "github.com/zalando/postgres-operator/pkg/spec" - "github.com/zalando/postgres-operator/pkg/util" - "github.com/zalando/postgres-operator/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/util" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" ) const ( diff --git a/pkg/util/util.go b/pkg/util/util.go index 79ff52282..8df951189 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/zalando/postgres-operator/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/spec" "golang.org/x/crypto/pbkdf2" ) diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go index 37e41f1cf..f5dc38989 100644 --- a/pkg/util/util_test.go +++ b/pkg/util/util_test.go @@ -8,7 +8,7 @@ import ( "regexp" - "github.com/zalando/postgres-operator/pkg/spec" + "github.com/zalando/postgres-operator/v2/pkg/spec" ) var pgUsers = []struct { diff --git a/pkg/util/volumes/ebs.go b/pkg/util/volumes/ebs.go index 7962a50b3..acaa03fb9 100644 --- a/pkg/util/volumes/ebs.go +++ b/pkg/util/volumes/ebs.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/types" v1 "k8s.io/api/core/v1" - "github.com/zalando/postgres-operator/pkg/util/constants" - "github.com/zalando/postgres-operator/pkg/util/retryutil" + "github.com/zalando/postgres-operator/v2/pkg/util/constants" + "github.com/zalando/postgres-operator/v2/pkg/util/retryutil" ) // EBSVolumeResizer implements volume resizing interface for AWS EBS volumes. diff --git a/pkg/util/volumes/ebs_test.go b/pkg/util/volumes/ebs_test.go index 6f722ff7b..073ce2197 100644 --- a/pkg/util/volumes/ebs_test.go +++ b/pkg/util/volumes/ebs_test.go @@ -2,9 +2,9 @@ package volumes import ( "fmt" - "testing" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "testing" ) func TestGetProviderVolumeID(t *testing.T) { @@ -88,7 +88,7 @@ func TestVolumeBelongsToProvider(t *testing.T) { name: "AWS EBS volume handle", pv: &v1.PersistentVolume{ ObjectMeta: metav1.ObjectMeta{ - Annotations: map[string]string { + Annotations: map[string]string{ "pv.kubernetes.io/provisioned-by": "kubernetes.io/aws-ebs", }, },