diff --git a/Makefile b/Makefile index 9311b207fd..365d2ac0fb 100644 --- a/Makefile +++ b/Makefile @@ -246,7 +246,7 @@ generate: generate-cw generate-crunchy-crd: ## Generate crd GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \ $(CRD_OPTIONS) \ - paths='./pkg/apis/upstream.pgv2.percona.com/...' \ + paths='./pkg/apis/upstream.pgv3.percona.com/...' \ output:dir='build/crd/crunchy/generated' # build/crd/generated/{group}_{plural}.yaml @ GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \ @@ -264,10 +264,10 @@ generate-crunchy-crd: ## Generate crd paths='./pkg/apis/...' \ output:dir='build/crd/crunchybridgeclusters/generated' # build/crd/{plural}/generated/{group}_{plural}.yaml @ - $(KUSTOMIZE) build ./build/crd/crunchy/ > ./config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml - $(KUSTOMIZE) build ./build/crd/pgupgrades > ./config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml - $(KUSTOMIZE) build ./build/crd/pgadmins > ./config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml - $(KUSTOMIZE) build ./build/crd/crunchybridgeclusters > ./config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml + $(KUSTOMIZE) build ./build/crd/crunchy/ > ./config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml + $(KUSTOMIZE) build ./build/crd/pgupgrades > ./config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml + $(KUSTOMIZE) build ./build/crd/pgadmins > ./config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml + $(KUSTOMIZE) build ./build/crd/crunchybridgeclusters > ./config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml .PHONY: generate-deepcopy generate-deepcopy: ## Generate deepcopy functions @@ -294,9 +294,9 @@ generate-percona-crd: go generate ./percona/... GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \ $(CRD_OPTIONS) \ - paths='./pkg/apis/pgv2.percona.com/...' \ + paths='./pkg/apis/pgv3.percona.com/...' \ output:dir='build/crd/percona/generated' # build/crd/generated/{group}_{plural}.yaml - $(KUSTOMIZE) build ./build/crd/percona/ > ./config/crd/bases/pgv2.percona.com_perconapgclusters.yaml + $(KUSTOMIZE) build ./build/crd/percona/ > ./config/crd/bases/pgv3.percona.com_perconapgclusters.yaml generate-manager: cd ./config/manager/namespace/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE) @@ -433,7 +433,7 @@ release: generate -e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" \ -e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \ -e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml - $(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go + $(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/" pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go $(SED) -i \ -e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_UPGRADE)#}" \ -e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \ @@ -441,7 +441,7 @@ release: generate -e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" deploy/upgrade.yaml # Update sidecars - $(SED) -i -r "s#pgv2.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv2.percona.com/version: $(VERSION)#" e2e-tests/tests/sidecars/01-assert.yaml + $(SED) -i -r "s#pgv3.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv3.percona.com/version: $(VERSION)#" e2e-tests/tests/sidecars/01-assert.yaml # Prepare main branch after release CURRENT_VERSION := $(shell grep -oE "crVersion: [0-9]+\.[0-9]+\.[0-9]+" deploy/cr.yaml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") @@ -461,7 +461,7 @@ after-release: update-version generate after-release-versions -e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" \ -e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \ -e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/pmm-client:3-dev-latest#}" deploy/cr.yaml percona/controller/testdata/sidecar-resources-cr.yaml - $(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(NEXT_VER)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go + $(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(NEXT_VER)/" pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go $(SED) -i \ -e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-upgrade#}" \ -e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \ @@ -469,7 +469,7 @@ after-release: update-version generate after-release-versions -e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" deploy/upgrade.yaml # Update sidecars - $(SED) -i -r "s#pgv2.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv2.percona.com/version: $(NEXT_VER)#" e2e-tests/tests/sidecars/01-assert.yaml + $(SED) -i -r "s#pgv3.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv3.percona.com/version: $(NEXT_VER)#" e2e-tests/tests/sidecars/01-assert.yaml # Update upgrade-consistency $(SED) -i "s/$(PREV2_VERSION)/$(PREV1_VERSION)/g" e2e-tests/tests/upgrade-consistency/01-*.yaml diff --git a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml index d1e9faf222..0ecbaac3a4 100644 --- a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml +++ b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PostgresCluster listKind: PostgresClusterList diff --git a/build/crd/crunchy/kustomization.yaml b/build/crd/crunchy/kustomization.yaml index c525939792..2a462ce6de 100644 --- a/build/crd/crunchy/kustomization.yaml +++ b/build/crd/crunchy/kustomization.yaml @@ -2,32 +2,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- generated/upstream.pgv2.percona.com_postgresclusters.yaml +- generated/upstream.pgv3.percona.com_postgresclusters.yaml patchesJson6902: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com path: condition.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com path: validation.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com patch: |- - op: add path: "/metadata/labels" diff --git a/build/crd/crunchybridgeclusters/kustomization.yaml b/build/crd/crunchybridgeclusters/kustomization.yaml index 71136a3bfd..2c86faa1e5 100644 --- a/build/crd/crunchybridgeclusters/kustomization.yaml +++ b/build/crd/crunchybridgeclusters/kustomization.yaml @@ -2,14 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- generated/upstream.pgv2.percona.com_crunchybridgeclusters.yaml +- generated/upstream.pgv3.percona.com_crunchybridgeclusters.yaml patches: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: crunchybridgeclusters.upstream.pgv2.percona.com + name: crunchybridgeclusters.upstream.pgv3.percona.com # The version below should match the version on the PostgresCluster CRD patch: |- - op: add diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml b/build/crd/percona/generated/pgv3.percona.com_perconapgbackups.yaml similarity index 99% rename from build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml rename to build/crd/percona/generated/pgv3.percona.com_perconapgbackups.yaml index f2796d1628..a0a2294378 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml +++ b/build/crd/percona/generated/pgv3.percona.com_perconapgbackups.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgbackups.pgv2.percona.com + name: perconapgbackups.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv3.percona.com_perconapgclusters.yaml similarity index 99% rename from build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml rename to build/crd/percona/generated/pgv3.percona.com_perconapgclusters.yaml index f681b7dc1b..0790d1f533 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml +++ b/build/crd/percona/generated/pgv3.percona.com_perconapgclusters.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml b/build/crd/percona/generated/pgv3.percona.com_perconapgrestores.yaml similarity index 99% rename from build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml rename to build/crd/percona/generated/pgv3.percona.com_perconapgrestores.yaml index 8cd069714e..01054677a0 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml +++ b/build/crd/percona/generated/pgv3.percona.com_perconapgrestores.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgrestores.pgv2.percona.com + name: perconapgrestores.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml b/build/crd/percona/generated/pgv3.percona.com_perconapgupgrades.yaml similarity index 99% rename from build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml rename to build/crd/percona/generated/pgv3.percona.com_perconapgupgrades.yaml index b438fd09b4..ef6e3a6048 100644 --- a/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml +++ b/build/crd/percona/generated/pgv3.percona.com_perconapgupgrades.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgupgrades.pgv2.percona.com + name: perconapgupgrades.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList diff --git a/build/crd/percona/kustomization.yaml b/build/crd/percona/kustomization.yaml index dc52731bcc..6deaef033b 100644 --- a/build/crd/percona/kustomization.yaml +++ b/build/crd/percona/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- generated/pgv2.percona.com_perconapgclusters.yaml -- generated/pgv2.percona.com_perconapgbackups.yaml -- generated/pgv2.percona.com_perconapgrestores.yaml -- generated/pgv2.percona.com_perconapgupgrades.yaml +- generated/pgv3.percona.com_perconapgclusters.yaml +- generated/pgv3.percona.com_perconapgbackups.yaml +- generated/pgv3.percona.com_perconapgrestores.yaml +- generated/pgv3.percona.com_perconapgupgrades.yaml diff --git a/build/crd/pgadmins/kustomization.yaml b/build/crd/pgadmins/kustomization.yaml index 199a3e974b..d366af89a9 100644 --- a/build/crd/pgadmins/kustomization.yaml +++ b/build/crd/pgadmins/kustomization.yaml @@ -2,20 +2,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- generated/upstream.pgv2.percona.com_pgadmins.yaml +- generated/upstream.pgv3.percona.com_pgadmins.yaml patches: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgadmins.upstream.pgv2.percona.com + name: pgadmins.upstream.pgv3.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgadmins.upstream.pgv2.percona.com + name: pgadmins.upstream.pgv3.percona.com # The version below should match the version on the PostgresCluster CRD patch: |- - op: add diff --git a/build/crd/pgupgrades/kustomization.yaml b/build/crd/pgupgrades/kustomization.yaml index 5b57138848..87a2ba7e8e 100644 --- a/build/crd/pgupgrades/kustomization.yaml +++ b/build/crd/pgupgrades/kustomization.yaml @@ -2,20 +2,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- generated/upstream.pgv2.percona.com_pgupgrades.yaml +- generated/upstream.pgv3.percona.com_pgupgrades.yaml patches: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgupgrades.upstream.pgv2.percona.com + name: pgupgrades.upstream.pgv3.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgupgrades.upstream.pgv2.percona.com + name: pgupgrades.upstream.pgv3.percona.com # The version below should match the version on the PostgresCluster CRD patch: |- - op: add diff --git a/build/crd/postgresclusters/kustomization.yaml b/build/crd/postgresclusters/kustomization.yaml index 5a053e93b3..252c803c48 100644 --- a/build/crd/postgresclusters/kustomization.yaml +++ b/build/crd/postgresclusters/kustomization.yaml @@ -2,32 +2,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- generated/upstream.pgv2.percona.com_postgresclusters.yaml +- generated/upstream.pgv3.percona.com_postgresclusters.yaml patchesJson6902: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com path: condition.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com path: validation.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com patch: |- - op: add path: "/metadata/labels" diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile index 45c38b9745..110df8036c 100644 --- a/build/postgres-operator/Dockerfile +++ b/build/postgres-operator/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubi10 +ARG BASE_IMAGE=ubi9 FROM --platform=${BUILDPLATFORM} golang:1.26 AS go_builder WORKDIR /go/src/github.com/percona/percona-postgresql-operator @@ -48,7 +48,7 @@ RUN ./bin/license_aggregator.sh ./cmd/...; \ cp -r ./licenses /licenses FROM registry.access.redhat.com/${BASE_IMAGE}/ubi-minimal AS ubi -RUN microdnf update -y && microdnf clean all -y +RUN microdnf update -y && microdnf clean all -y || true LABEL name="Percona Postgres Operator" \ vendor="Percona" \ diff --git a/cmd/extension-installer/main.go b/cmd/extension-installer/main.go index 6f628e0f85..ba5b724ae4 100644 --- a/cmd/extension-installer/main.go +++ b/cmd/extension-installer/main.go @@ -7,7 +7,7 @@ import ( "os" "path" - "github.com/percona/percona-postgresql-operator/v2/percona/extensions" + "github.com/percona/percona-postgresql-operator/v3/percona/extensions" ) func main() { diff --git a/cmd/postgres-operator/main.go b/cmd/postgres-operator/main.go index f61123c4b1..fae2dd3ebd 100644 --- a/cmd/postgres-operator/main.go +++ b/cmd/postgres-operator/main.go @@ -29,25 +29,25 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" certmanagerscheme "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/scheme" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/pgupgrade" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/standalone_pgadmin" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/upgradecheck" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - perconaController "github.com/percona/percona-postgresql-operator/v2/percona/controller" - "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgbackup" - "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgcluster" - "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgrestore" - perconaPGUpgrade "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgupgrade" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - perconaRuntime "github.com/percona/percona-postgresql-operator/v2/percona/runtime" - "github.com/percona/percona-postgresql-operator/v2/percona/utils/registry" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/pgupgrade" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/standalone_pgadmin" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/upgradecheck" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + perconaController "github.com/percona/percona-postgresql-operator/v3/percona/controller" + "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgbackup" + "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgcluster" + "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgrestore" + perconaPGUpgrade "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgupgrade" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + perconaRuntime "github.com/percona/percona-postgresql-operator/v3/percona/runtime" + "github.com/percona/percona-postgresql-operator/v3/percona/utils/registry" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var ( diff --git a/cmd/postgres-operator/main_test.go b/cmd/postgres-operator/main_test.go index 4e04c4af2a..77978d168e 100644 --- a/cmd/postgres-operator/main_test.go +++ b/cmd/postgres-operator/main_test.go @@ -27,13 +27,13 @@ func TestInitManager(t *testing.T) { assert.DeepEqual(t, options.Controller.GroupKindConcurrency, map[string]int{ - "PGAdmin.upstream.pgv2.percona.com": 1, - "PGUpgrade.upstream.pgv2.percona.com": 1, - "PerconaPGBackup.pgv2.percona.com": 1, - "PerconaPGCluster.pgv2.percona.com": 1, - "PerconaPGRestore.pgv2.percona.com": 1, - "PerconaPGUpgrade.pgv2.percona.com": 1, - "PostgresCluster.upstream.pgv2.percona.com": 1, + "PGAdmin.upstream.pgv3.percona.com": 1, + "PGUpgrade.upstream.pgv3.percona.com": 1, + "PerconaPGBackup.pgv3.percona.com": 1, + "PerconaPGCluster.pgv3.percona.com": 1, + "PerconaPGRestore.pgv3.percona.com": 1, + "PerconaPGUpgrade.pgv3.percona.com": 1, + "PostgresCluster.upstream.pgv3.percona.com": 1, }) assert.Assert(t, options.Cache.DefaultNamespaces == nil) @@ -125,13 +125,13 @@ func TestInitManager(t *testing.T) { } assert.DeepEqual(t, options.Controller.GroupKindConcurrency, map[string]int{ - "PGAdmin.upstream.pgv2.percona.com": 1, - "PGUpgrade.upstream.pgv2.percona.com": 1, - "PerconaPGBackup.pgv2.percona.com": 1, - "PerconaPGCluster.pgv2.percona.com": 1, - "PerconaPGRestore.pgv2.percona.com": 1, - "PerconaPGUpgrade.pgv2.percona.com": 1, - "PostgresCluster.upstream.pgv2.percona.com": 1, + "PGAdmin.upstream.pgv3.percona.com": 1, + "PGUpgrade.upstream.pgv3.percona.com": 1, + "PerconaPGBackup.pgv3.percona.com": 1, + "PerconaPGCluster.pgv3.percona.com": 1, + "PerconaPGRestore.pgv3.percona.com": 1, + "PerconaPGUpgrade.pgv3.percona.com": 1, + "PostgresCluster.upstream.pgv3.percona.com": 1, }) } }) @@ -143,13 +143,13 @@ func TestInitManager(t *testing.T) { assert.NilError(t, err) assert.DeepEqual(t, options.Controller.GroupKindConcurrency, map[string]int{ - "PGAdmin.upstream.pgv2.percona.com": 19, - "PGUpgrade.upstream.pgv2.percona.com": 19, - "PerconaPGBackup.pgv2.percona.com": 19, - "PerconaPGCluster.pgv2.percona.com": 19, - "PerconaPGRestore.pgv2.percona.com": 19, - "PerconaPGUpgrade.pgv2.percona.com": 19, - "PostgresCluster.upstream.pgv2.percona.com": 19, + "PGAdmin.upstream.pgv3.percona.com": 19, + "PGUpgrade.upstream.pgv3.percona.com": 19, + "PerconaPGBackup.pgv3.percona.com": 19, + "PerconaPGCluster.pgv3.percona.com": 19, + "PerconaPGRestore.pgv3.percona.com": 19, + "PerconaPGUpgrade.pgv3.percona.com": 19, + "PostgresCluster.upstream.pgv3.percona.com": 19, }) }) }) diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv3.percona.com_perconapgclusters.yaml similarity index 99% rename from config/crd/bases/pgv2.percona.com_perconapgclusters.yaml rename to config/crd/bases/pgv3.percona.com_perconapgclusters.yaml index dc84190b56..0817e3cc95 100644 --- a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml +++ b/config/crd/bases/pgv3.percona.com_perconapgclusters.yaml @@ -3,9 +3,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgbackups.pgv2.percona.com + name: perconapgbackups.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -702,9 +702,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -29840,9 +29840,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgrestores.pgv2.percona.com + name: perconapgrestores.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30160,9 +30160,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgupgrades.pgv2.percona.com + name: perconapgupgrades.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList diff --git a/config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml b/config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml similarity index 99% rename from config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml rename to config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml index 05029ef3ff..dca9951596 100644 --- a/config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml +++ b/config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: crunchybridgeclusters.upstream.pgv2.percona.com + name: crunchybridgeclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList diff --git a/config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml b/config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml similarity index 99% rename from config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml rename to config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml index 532ccfaeba..56af762534 100644 --- a/config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml +++ b/config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv2.percona.com + name: pgadmins.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGAdmin listKind: PGAdminList diff --git a/config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml b/config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml similarity index 99% rename from config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml rename to config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml index 1a16db6750..2603b51e3a 100644 --- a/config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml +++ b/config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv2.percona.com + name: pgupgrades.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGUpgrade listKind: PGUpgradeList diff --git a/config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml b/config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml similarity index 99% rename from config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml rename to config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml index e8ba977e3c..6a1a71172d 100644 --- a/config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml +++ b/config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PostgresCluster listKind: PostgresClusterList diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 89152620f1..3b4da571e2 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml -- bases/upstream.pgv2.percona.com_postgresclusters.yaml -- bases/pgv2.percona.com_perconapgclusters.yaml -- bases/upstream.pgv2.percona.com_pgupgrades.yaml -- bases/upstream.pgv2.percona.com_pgadmins.yaml +- bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml +- bases/upstream.pgv3.percona.com_postgresclusters.yaml +- bases/pgv3.percona.com_perconapgclusters.yaml +- bases/upstream.pgv3.percona.com_pgupgrades.yaml +- bases/upstream.pgv3.percona.com_pgadmins.yaml patchesStrategicMerge: - patches/versionlabel_in_perconapgclusters.yaml diff --git a/config/crd/patches/versionlabel_in_perconapgbackups.yaml b/config/crd/patches/versionlabel_in_perconapgbackups.yaml index 011f646c10..12377cda4a 100644 --- a/config/crd/patches/versionlabel_in_perconapgbackups.yaml +++ b/config/crd/patches/versionlabel_in_perconapgbackups.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgbackups.pgv2.percona.com + name: perconapgbackups.pgv3.percona.com labels: - pgv2.percona.com/version: v3.1.0 + pgv3.percona.com/version: v3.1.0 diff --git a/config/crd/patches/versionlabel_in_perconapgclusters.yaml b/config/crd/patches/versionlabel_in_perconapgclusters.yaml index d7b16fc81f..7c9013fc94 100644 --- a/config/crd/patches/versionlabel_in_perconapgclusters.yaml +++ b/config/crd/patches/versionlabel_in_perconapgclusters.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com labels: - pgv2.percona.com/version: v3.1.0 + pgv3.percona.com/version: v3.1.0 diff --git a/config/crd/patches/versionlabel_in_perconapgrestores.yaml b/config/crd/patches/versionlabel_in_perconapgrestores.yaml index 8517135fca..6398071583 100644 --- a/config/crd/patches/versionlabel_in_perconapgrestores.yaml +++ b/config/crd/patches/versionlabel_in_perconapgrestores.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgrestores.pgv2.percona.com + name: perconapgrestores.pgv3.percona.com labels: - pgv2.percona.com/version: v3.1.0 + pgv3.percona.com/version: v3.1.0 diff --git a/config/crd/patches/versionlabel_in_perconapgupgrade.yaml b/config/crd/patches/versionlabel_in_perconapgupgrade.yaml index 9c86cfbd17..66b7f595ed 100644 --- a/config/crd/patches/versionlabel_in_perconapgupgrade.yaml +++ b/config/crd/patches/versionlabel_in_perconapgupgrade.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgupgrades.pgv2.percona.com + name: perconapgupgrades.pgv3.percona.com labels: - pgv2.percona.com/version: v3.1.0 + pgv3.percona.com/version: v3.1.0 diff --git a/config/manager/default/kustomization.yaml b/config/manager/default/kustomization.yaml index a04f73c25d..efeaabde93 100644 --- a/config/manager/default/kustomization.yaml +++ b/config/manager/default/kustomization.yaml @@ -7,4 +7,4 @@ commonLabels: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator diff --git a/config/rbac/cluster/role.yaml b/config/rbac/cluster/role.yaml index 462ac735b9..fe5185a7b6 100644 --- a/config/rbac/cluster/role.yaml +++ b/config/rbac/cluster/role.yaml @@ -122,7 +122,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups verbs: @@ -134,7 +134,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -146,7 +146,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/status verbs: @@ -154,7 +154,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters - perconapgupgrades @@ -166,13 +166,13 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgrestores verbs: @@ -225,7 +225,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters verbs: @@ -235,7 +235,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -243,7 +243,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins verbs: @@ -251,7 +251,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -259,14 +259,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgupgrades - postgresclusters @@ -279,7 +279,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - postgresclusters/status verbs: diff --git a/config/rbac/namespace/role.yaml b/config/rbac/namespace/role.yaml index 5361ec1a72..6cdb1a6046 100644 --- a/config/rbac/namespace/role.yaml +++ b/config/rbac/namespace/role.yaml @@ -122,7 +122,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups verbs: @@ -134,7 +134,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -146,7 +146,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/status verbs: @@ -154,7 +154,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters - perconapgupgrades @@ -166,13 +166,13 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgrestores verbs: @@ -225,7 +225,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters verbs: @@ -235,7 +235,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -243,7 +243,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins verbs: @@ -251,7 +251,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -259,14 +259,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgupgrades - postgresclusters @@ -279,7 +279,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - postgresclusters/status verbs: diff --git a/deploy/backup.yaml b/deploy/backup.yaml index 8f9a9c347a..255ee138c5 100644 --- a/deploy/backup.yaml +++ b/deploy/backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: backup1 diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index fe1b049f51..999926c000 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: crunchybridgeclusters.upstream.pgv2.percona.com + name: crunchybridgeclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList @@ -297,10 +297,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgbackups.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgbackups.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -998,10 +998,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgclusters.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -30138,10 +30138,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgrestores.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgrestores.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30460,10 +30460,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgupgrades.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgupgrades.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList @@ -33268,9 +33268,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv2.percona.com + name: pgadmins.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGAdmin listKind: PGAdminList @@ -35286,9 +35286,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv2.percona.com + name: pgupgrades.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGUpgrade listKind: PGUpgradeList @@ -38079,9 +38079,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PostgresCluster listKind: PostgresClusterList @@ -69333,7 +69333,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups verbs: @@ -69345,7 +69345,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -69357,7 +69357,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/status verbs: @@ -69365,7 +69365,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters - perconapgupgrades @@ -69377,13 +69377,13 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgrestores verbs: @@ -69436,7 +69436,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters verbs: @@ -69446,7 +69446,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -69454,7 +69454,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins verbs: @@ -69462,7 +69462,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -69470,14 +69470,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgupgrades - postgresclusters @@ -69490,7 +69490,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - postgresclusters/status verbs: @@ -69518,7 +69518,7 @@ metadata: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator name: percona-postgresql-operator spec: replicas: 1 @@ -69528,7 +69528,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator strategy: type: Recreate template: @@ -69538,7 +69538,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/cr.yaml b/deploy/cr.yaml index e6d71f7858..4285af9e92 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: cluster1 diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 12324006db..2990414794 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: crunchybridgeclusters.upstream.pgv2.percona.com + name: crunchybridgeclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList @@ -297,10 +297,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgbackups.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgbackups.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -998,10 +998,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgclusters.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -30138,10 +30138,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgrestores.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgrestores.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30460,10 +30460,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgupgrades.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgupgrades.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList @@ -33268,9 +33268,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv2.percona.com + name: pgadmins.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGAdmin listKind: PGAdminList @@ -35286,9 +35286,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv2.percona.com + name: pgupgrades.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGUpgrade listKind: PGUpgradeList @@ -38079,9 +38079,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PostgresCluster listKind: PostgresClusterList diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 120019fd8f..d27e6163f3 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: crunchybridgeclusters.upstream.pgv2.percona.com + name: crunchybridgeclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList @@ -297,10 +297,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgbackups.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgbackups.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -998,10 +998,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgclusters.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -30138,10 +30138,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgrestores.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgrestores.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30460,10 +30460,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.1.0 - name: perconapgupgrades.pgv2.percona.com + pgv3.percona.com/version: v3.1.0 + name: perconapgupgrades.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList @@ -33268,9 +33268,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv2.percona.com + name: pgadmins.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGAdmin listKind: PGAdminList @@ -35286,9 +35286,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv2.percona.com + name: pgupgrades.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PGUpgrade listKind: PGUpgradeList @@ -38079,9 +38079,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv2.percona.com + name: postgresclusters.upstream.pgv3.percona.com spec: - group: upstream.pgv2.percona.com + group: upstream.pgv3.percona.com names: kind: PostgresCluster listKind: PostgresClusterList @@ -69333,7 +69333,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups verbs: @@ -69345,7 +69345,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -69357,7 +69357,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/status verbs: @@ -69365,7 +69365,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters - perconapgupgrades @@ -69377,13 +69377,13 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgrestores verbs: @@ -69436,7 +69436,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters verbs: @@ -69446,7 +69446,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -69454,7 +69454,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins verbs: @@ -69462,7 +69462,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -69470,14 +69470,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgupgrades - postgresclusters @@ -69490,7 +69490,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - postgresclusters/status verbs: @@ -69519,7 +69519,7 @@ metadata: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator name: percona-postgresql-operator spec: replicas: 1 @@ -69529,7 +69529,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator strategy: type: Recreate template: @@ -69539,7 +69539,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml index 48a7758660..366fb8f350 100644 --- a/deploy/cw-operator.yaml +++ b/deploy/cw-operator.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator name: percona-postgresql-operator spec: replicas: 1 @@ -16,7 +16,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator strategy: type: Recreate template: @@ -26,7 +26,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/cw-rbac.yaml b/deploy/cw-rbac.yaml index 1072b497e1..13dbbe2dcf 100644 --- a/deploy/cw-rbac.yaml +++ b/deploy/cw-rbac.yaml @@ -126,7 +126,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups verbs: @@ -138,7 +138,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -150,7 +150,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/status verbs: @@ -158,7 +158,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters - perconapgupgrades @@ -170,13 +170,13 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgrestores verbs: @@ -229,7 +229,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters verbs: @@ -239,7 +239,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -247,7 +247,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins verbs: @@ -255,7 +255,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -263,14 +263,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgupgrades - postgresclusters @@ -283,7 +283,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - postgresclusters/status verbs: diff --git a/deploy/operator.yaml b/deploy/operator.yaml index f7f95a0886..598f0af511 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator name: percona-postgresql-operator spec: replicas: 1 @@ -16,7 +16,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator strategy: type: Recreate template: @@ -26,7 +26,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv2.percona.com/control-plane: postgres-operator + pgv3.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml index c815cb520a..960b3170b1 100644 --- a/deploy/rbac.yaml +++ b/deploy/rbac.yaml @@ -126,7 +126,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups verbs: @@ -138,7 +138,7 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -150,7 +150,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgbackups/status verbs: @@ -158,7 +158,7 @@ rules: - patch - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters - perconapgupgrades @@ -170,13 +170,13 @@ rules: - update - watch - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv2.percona.com + - pgv3.percona.com resources: - perconapgrestores verbs: @@ -229,7 +229,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters verbs: @@ -239,7 +239,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -247,7 +247,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins verbs: @@ -255,7 +255,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -263,14 +263,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - pgupgrades - postgresclusters @@ -283,7 +283,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv2.percona.com + - upstream.pgv3.percona.com resources: - postgresclusters/status verbs: diff --git a/deploy/restore.yaml b/deploy/restore.yaml index c1a31acbe6..7206522f31 100644 --- a/deploy/restore.yaml +++ b/deploy/restore.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: restore1 diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml index 4c3126e416..3d9b3e0fd2 100644 --- a/deploy/upgrade.yaml +++ b/deploy/upgrade.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGUpgrade metadata: name: cluster1-17-to-18 diff --git a/docs/content/references/crd.md b/docs/content/references/crd.md index 2d96987abf..2a33771836 100644 --- a/docs/content/references/crd.md +++ b/docs/content/references/crd.md @@ -6,10 +6,10 @@ weight: 100 Packages: -- [pgv2.percona.com/v2](#pgv2perconacomv2) -- [upstream.pgv2.percona.com/v1beta1](#postgres-operatorcrunchydatacomv1beta1) +- [pgv3.percona.com/v2](#pgv3perconacomv2) +- [upstream.pgv3.percona.com/v1beta1](#postgres-operatorcrunchydatacomv1beta1) -

pgv2.percona.com/v2

+

pgv3.percona.com/v2

Resource Types: @@ -43,7 +43,7 @@ PerconaPGBackup is the CRD that defines a Percona PostgreSQL Backup apiVersion string - pgv2.percona.com/v2 + pgv3.percona.com/v2 true @@ -780,7 +780,7 @@ PerconaPGCluster is the CRD that defines a Percona PG Cluster apiVersion string - pgv2.percona.com/v2 + pgv3.percona.com/v2 true @@ -25824,7 +25824,7 @@ PerconaPGRestore is the CRD that defines a Percona PostgreSQL Restore apiVersion string - pgv2.percona.com/v2 + pgv3.percona.com/v2 true @@ -25928,7 +25928,7 @@ https://pgbackrest.org/command.html#command-restore -

upstream.pgv2.percona.com/v1beta1

+

upstream.pgv3.percona.com/v1beta1

Resource Types: @@ -25960,7 +25960,7 @@ PGUpgrade is the Schema for the pgupgrades API apiVersion string - upstream.pgv2.percona.com/v1beta1 + upstream.pgv3.percona.com/v1beta1 true @@ -27794,7 +27794,7 @@ PostgresCluster is the Schema for the postgresclusters API apiVersion string - upstream.pgv2.percona.com/v1beta1 + upstream.pgv3.percona.com/v1beta1 true diff --git a/e2e-tests/tests/backup-enable-disable/00-assert.yaml b/e2e-tests/tests/backup-enable-disable/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/backup-enable-disable/00-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/backup-enable-disable/01-assert.yaml b/e2e-tests/tests/backup-enable-disable/01-assert.yaml index f361720906..64be08f5de 100644 --- a/e2e-tests/tests/backup-enable-disable/01-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: some-name controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/backup-enable-disable/02-assert.yaml b/e2e-tests/tests/backup-enable-disable/02-assert.yaml index 1bb711ae0b..56362d3730 100644 --- a/e2e-tests/tests/backup-enable-disable/02-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/02-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -32,7 +32,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -54,7 +54,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -74,19 +74,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: some-name controller: true @@ -109,7 +109,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/backup-enable-disable/03-assert.yaml b/e2e-tests/tests/backup-enable-disable/03-assert.yaml index 25990eea10..19f1a663c1 100644 --- a/e2e-tests/tests/backup-enable-disable/03-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/03-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -31,7 +31,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -42,12 +42,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: some-name-datasource controller: true @@ -66,7 +66,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name-datasource diff --git a/e2e-tests/tests/backup-enable-disable/04-assert.yaml b/e2e-tests/tests/backup-enable-disable/04-assert.yaml index ab630db07d..d735814c8b 100644 --- a/e2e-tests/tests/backup-enable-disable/04-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/04-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -31,7 +31,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -53,7 +53,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -73,19 +73,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: some-name-datasource controller: true @@ -108,7 +108,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name-datasource diff --git a/e2e-tests/tests/backup-enable-disable/05-assert.yaml b/e2e-tests/tests/backup-enable-disable/05-assert.yaml index 67b8e41bd1..e7ecbc3eb7 100644 --- a/e2e-tests/tests/backup-enable-disable/05-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/05-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -31,7 +31,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -42,12 +42,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: some-name-datasource controller: true @@ -69,7 +69,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name-datasource diff --git a/e2e-tests/tests/backup-enable-disable/05-disable-backups-datasource.yaml b/e2e-tests/tests/backup-enable-disable/05-disable-backups-datasource.yaml index 1fc95bbce8..ddebabcf3d 100644 --- a/e2e-tests/tests/backup-enable-disable/05-disable-backups-datasource.yaml +++ b/e2e-tests/tests/backup-enable-disable/05-disable-backups-datasource.yaml @@ -8,7 +8,7 @@ commands: source ../../functions get_cr "some-name-datasource" ${RANDOM} \ - | yq '.metadata.annotations."pgv2.percona.com/authorizeBackupRemoval"="true"' \ + | yq '.metadata.annotations."pgv3.percona.com/authorizeBackupRemoval"="true"' \ | yq '.spec.backups.enabled=false' \ | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/backup-enable-disable/07-assert.yaml b/e2e-tests/tests/backup-enable-disable/07-assert.yaml index 44365b2f3e..fa7dfe7d08 100644 --- a/e2e-tests/tests/backup-enable-disable/07-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/07-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: some-name controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/backup-enable-disable/07-disable-backups.yaml b/e2e-tests/tests/backup-enable-disable/07-disable-backups.yaml index 5d271cd318..164ad035c0 100644 --- a/e2e-tests/tests/backup-enable-disable/07-disable-backups.yaml +++ b/e2e-tests/tests/backup-enable-disable/07-disable-backups.yaml @@ -8,7 +8,7 @@ commands: source ../../functions get_cr "some-name" ${RANDOM} \ - | yq '.metadata.annotations."pgv2.percona.com/authorizeBackupRemoval"="true"' \ + | yq '.metadata.annotations."pgv3.percona.com/authorizeBackupRemoval"="true"' \ | yq '.spec.backups.enabled=false' \ | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/backup-enable-disable/09-assert.yaml b/e2e-tests/tests/backup-enable-disable/09-assert.yaml index f61b6d35e9..dbd3e6f5f0 100644 --- a/e2e-tests/tests/backup-enable-disable/09-assert.yaml +++ b/e2e-tests/tests/backup-enable-disable/09-assert.yaml @@ -36,7 +36,7 @@ metadata: status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name diff --git a/e2e-tests/tests/backup-enable-disable/09-enable-backups-again.yaml b/e2e-tests/tests/backup-enable-disable/09-enable-backups-again.yaml index 8a571cd9f0..d6c270dc74 100644 --- a/e2e-tests/tests/backup-enable-disable/09-enable-backups-again.yaml +++ b/e2e-tests/tests/backup-enable-disable/09-enable-backups-again.yaml @@ -8,6 +8,6 @@ commands: source ../../functions get_cr "some-name" ${RANDOM} \ - | yq 'del(.metadata.annotations."pgv2.percona.com/authorizeBackupRemoval")' \ + | yq 'del(.metadata.annotations."pgv3.percona.com/authorizeBackupRemoval")' \ | yq 'del(.spec.backups.enabled)' \ | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/backup-enable-disable/10-disable-backups-without-annotation.yaml b/e2e-tests/tests/backup-enable-disable/10-disable-backups-without-annotation.yaml index a00aa45aec..eab8d7fbed 100644 --- a/e2e-tests/tests/backup-enable-disable/10-disable-backups-without-annotation.yaml +++ b/e2e-tests/tests/backup-enable-disable/10-disable-backups-without-annotation.yaml @@ -8,7 +8,7 @@ commands: source ../../functions get_cr "some-name" ${RANDOM} \ - | yq 'del(.metadata.annotations."pgv2.percona.com/authorizeBackupRemoval")' \ + | yq 'del(.metadata.annotations."pgv3.percona.com/authorizeBackupRemoval")' \ | yq '.spec.backups.enabled=false' \ | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/backup-enable-disable/98-remove-datasource-cluster-gracefully.yaml b/e2e-tests/tests/backup-enable-disable/98-remove-datasource-cluster-gracefully.yaml index 64ee90a823..938f41550a 100644 --- a/e2e-tests/tests/backup-enable-disable/98-remove-datasource-cluster-gracefully.yaml +++ b/e2e-tests/tests/backup-enable-disable/98-remove-datasource-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name-datasource -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource diff --git a/e2e-tests/tests/backup-enable-disable/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/backup-enable-disable/99-remove-cluster-gracefully.yaml index b2093ea365..361e1a416c 100644 --- a/e2e-tests/tests/backup-enable-disable/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/backup-enable-disable/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name diff --git a/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable-spaces.yaml b/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable-spaces.yaml index 733eaca8bb..4a3ffb5fc3 100644 --- a/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable-spaces.yaml +++ b/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable-spaces.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable.yaml b/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable.yaml index 1b58fb3abd..2cb32b3bea 100644 --- a/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable.yaml +++ b/e2e-tests/tests/backup-enable-disable/conf/backup-enable-disable.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/builtin-extensions/00-assert.yaml b/e2e-tests/tests/builtin-extensions/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/builtin-extensions/00-assert.yaml +++ b/e2e-tests/tests/builtin-extensions/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/builtin-extensions/01-assert.yaml b/e2e-tests/tests/builtin-extensions/01-assert.yaml index f6b38bab98..7f6673405c 100644 --- a/e2e-tests/tests/builtin-extensions/01-assert.yaml +++ b/e2e-tests/tests/builtin-extensions/01-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/builtin-extensions/03-assert.yaml b/e2e-tests/tests/builtin-extensions/03-assert.yaml index 341741efa8..8128879b94 100644 --- a/e2e-tests/tests/builtin-extensions/03-assert.yaml +++ b/e2e-tests/tests/builtin-extensions/03-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/builtin-extensions/03-install-all-ext.yaml b/e2e-tests/tests/builtin-extensions/03-install-all-ext.yaml index c9fb037b2a..01053e469f 100644 --- a/e2e-tests/tests/builtin-extensions/03-install-all-ext.yaml +++ b/e2e-tests/tests/builtin-extensions/03-install-all-ext.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/builtin-extensions/06-assert.yaml b/e2e-tests/tests/builtin-extensions/06-assert.yaml index ebdc452ab4..34323eb61f 100644 --- a/e2e-tests/tests/builtin-extensions/06-assert.yaml +++ b/e2e-tests/tests/builtin-extensions/06-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/builtin-extensions/09-assert.yaml b/e2e-tests/tests/builtin-extensions/09-assert.yaml index 0b9bd23ed9..3694f6bcd3 100644 --- a/e2e-tests/tests/builtin-extensions/09-assert.yaml +++ b/e2e-tests/tests/builtin-extensions/09-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/builtin-extensions/09-uninstall-all-ext.yaml b/e2e-tests/tests/builtin-extensions/09-uninstall-all-ext.yaml index 827cde4fa5..738f0d47be 100644 --- a/e2e-tests/tests/builtin-extensions/09-uninstall-all-ext.yaml +++ b/e2e-tests/tests/builtin-extensions/09-uninstall-all-ext.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/builtin-extensions/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/builtin-extensions/99-remove-cluster-gracefully.yaml index fa74f2e991..d8ac70137c 100644 --- a/e2e-tests/tests/builtin-extensions/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/builtin-extensions/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions diff --git a/e2e-tests/tests/cert-manager-tls/00-assert.yaml b/e2e-tests/tests/cert-manager-tls/00-assert.yaml index 72235e683b..7cf832ff36 100644 --- a/e2e-tests/tests/cert-manager-tls/00-assert.yaml +++ b/e2e-tests/tests/cert-manager-tls/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/cert-manager-tls/01-assert.yaml b/e2e-tests/tests/cert-manager-tls/01-assert.yaml index 99d26e99b8..ee8b5aad00 100644 --- a/e2e-tests/tests/cert-manager-tls/01-assert.yaml +++ b/e2e-tests/tests/cert-manager-tls/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: cert-manager-tls controller: true @@ -31,7 +31,7 @@ metadata: postgres-operator.crunchydata.com/cluster: cert-manager-tls postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: cert-manager-tls controller: true @@ -51,14 +51,14 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: cert-manager-tls diff --git a/e2e-tests/tests/cert-manager-tls/09-assert.yaml b/e2e-tests/tests/cert-manager-tls/09-assert.yaml index 3fa4968d67..17f5a3e3b9 100644 --- a/e2e-tests/tests/cert-manager-tls/09-assert.yaml +++ b/e2e-tests/tests/cert-manager-tls/09-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: cert-manager-tls controller: true @@ -31,7 +31,7 @@ metadata: postgres-operator.crunchydata.com/cluster: cert-manager-tls postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: cert-manager-tls controller: true @@ -51,19 +51,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: cert-manager-tls ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: cert-manager-tls controller: true @@ -86,7 +86,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: cert-manager-tls diff --git a/e2e-tests/tests/cert-manager-tls/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/cert-manager-tls/99-remove-cluster-gracefully.yaml index dbc10adc6d..f3f6168814 100644 --- a/e2e-tests/tests/cert-manager-tls/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/cert-manager-tls/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: cert-manager-tls -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: cert-manager-tls diff --git a/e2e-tests/tests/custom-envs/00-assert.yaml b/e2e-tests/tests/custom-envs/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/custom-envs/00-assert.yaml +++ b/e2e-tests/tests/custom-envs/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/custom-envs/01-assert.yaml b/e2e-tests/tests/custom-envs/01-assert.yaml index c63a6c0675..a75fe54940 100644 --- a/e2e-tests/tests/custom-envs/01-assert.yaml +++ b/e2e-tests/tests/custom-envs/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-envs controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-envs controller: true @@ -53,19 +53,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/02-assert.yaml b/e2e-tests/tests/custom-envs/02-assert.yaml index c4dc5b5167..84fefd2720 100644 --- a/e2e-tests/tests/custom-envs/02-assert.yaml +++ b/e2e-tests/tests/custom-envs/02-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/03-assert.yaml b/e2e-tests/tests/custom-envs/03-assert.yaml index 12a35017e5..d8782ab864 100644 --- a/e2e-tests/tests/custom-envs/03-assert.yaml +++ b/e2e-tests/tests/custom-envs/03-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/04-assert.yaml b/e2e-tests/tests/custom-envs/04-assert.yaml index a83e6107d8..3b2f131e5b 100644 --- a/e2e-tests/tests/custom-envs/04-assert.yaml +++ b/e2e-tests/tests/custom-envs/04-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/05-assert.yaml b/e2e-tests/tests/custom-envs/05-assert.yaml index 1d8e958dc3..bb157e9e8b 100644 --- a/e2e-tests/tests/custom-envs/05-assert.yaml +++ b/e2e-tests/tests/custom-envs/05-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/06-assert.yaml b/e2e-tests/tests/custom-envs/06-assert.yaml index 0b5d89e541..0b4894fe25 100644 --- a/e2e-tests/tests/custom-envs/06-assert.yaml +++ b/e2e-tests/tests/custom-envs/06-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/07-assert.yaml b/e2e-tests/tests/custom-envs/07-assert.yaml index 14e7190ae8..f465006d2c 100644 --- a/e2e-tests/tests/custom-envs/07-assert.yaml +++ b/e2e-tests/tests/custom-envs/07-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/08-assert.yaml b/e2e-tests/tests/custom-envs/08-assert.yaml index fbbf0f286f..8bd02ff352 100644 --- a/e2e-tests/tests/custom-envs/08-assert.yaml +++ b/e2e-tests/tests/custom-envs/08-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/09-assert.yaml b/e2e-tests/tests/custom-envs/09-assert.yaml index 9840473223..a2200289e2 100644 --- a/e2e-tests/tests/custom-envs/09-assert.yaml +++ b/e2e-tests/tests/custom-envs/09-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/10-assert.yaml b/e2e-tests/tests/custom-envs/10-assert.yaml index bf901f4336..b87dc7e4c3 100644 --- a/e2e-tests/tests/custom-envs/10-assert.yaml +++ b/e2e-tests/tests/custom-envs/10-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/11-assert.yaml b/e2e-tests/tests/custom-envs/11-assert.yaml index 49c301c3e9..13d04f8b3c 100644 --- a/e2e-tests/tests/custom-envs/11-assert.yaml +++ b/e2e-tests/tests/custom-envs/11-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/12-assert.yaml b/e2e-tests/tests/custom-envs/12-assert.yaml index 2971f22838..50d974d45a 100644 --- a/e2e-tests/tests/custom-envs/12-assert.yaml +++ b/e2e-tests/tests/custom-envs/12-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/13-assert.yaml b/e2e-tests/tests/custom-envs/13-assert.yaml index cdf16b7821..6b58823e9d 100644 --- a/e2e-tests/tests/custom-envs/13-assert.yaml +++ b/e2e-tests/tests/custom-envs/13-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/14-assert.yaml b/e2e-tests/tests/custom-envs/14-assert.yaml index 0f6da60ff3..9171b503c4 100644 --- a/e2e-tests/tests/custom-envs/14-assert.yaml +++ b/e2e-tests/tests/custom-envs/14-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/15-assert.yaml b/e2e-tests/tests/custom-envs/15-assert.yaml index b49c7632b2..429ada660c 100644 --- a/e2e-tests/tests/custom-envs/15-assert.yaml +++ b/e2e-tests/tests/custom-envs/15-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/16-assert.yaml b/e2e-tests/tests/custom-envs/16-assert.yaml index fec1c1abed..d98fa5d257 100644 --- a/e2e-tests/tests/custom-envs/16-assert.yaml +++ b/e2e-tests/tests/custom-envs/16-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/17-assert.yaml b/e2e-tests/tests/custom-envs/17-assert.yaml index 5fb98a1942..a26ceb6c9e 100644 --- a/e2e-tests/tests/custom-envs/17-assert.yaml +++ b/e2e-tests/tests/custom-envs/17-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/18-assert.yaml b/e2e-tests/tests/custom-envs/18-assert.yaml index 1d2316bb93..194438b513 100644 --- a/e2e-tests/tests/custom-envs/18-assert.yaml +++ b/e2e-tests/tests/custom-envs/18-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/19-assert.yaml b/e2e-tests/tests/custom-envs/19-assert.yaml index ebb2f044cf..fa0ae8cabf 100644 --- a/e2e-tests/tests/custom-envs/19-assert.yaml +++ b/e2e-tests/tests/custom-envs/19-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/20-assert.yaml b/e2e-tests/tests/custom-envs/20-assert.yaml index 652c4fb71f..9a6bf7dd9a 100644 --- a/e2e-tests/tests/custom-envs/20-assert.yaml +++ b/e2e-tests/tests/custom-envs/20-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/21-assert.yaml b/e2e-tests/tests/custom-envs/21-assert.yaml index 2c1e2d716b..a1d88acc64 100644 --- a/e2e-tests/tests/custom-envs/21-assert.yaml +++ b/e2e-tests/tests/custom-envs/21-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/22-assert.yaml b/e2e-tests/tests/custom-envs/22-assert.yaml index d4deaf9896..56758d1ba6 100644 --- a/e2e-tests/tests/custom-envs/22-assert.yaml +++ b/e2e-tests/tests/custom-envs/22-assert.yaml @@ -2,12 +2,12 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-envs diff --git a/e2e-tests/tests/custom-envs/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/custom-envs/99-remove-cluster-gracefully.yaml index b2d5900099..96024891a8 100644 --- a/e2e-tests/tests/custom-envs/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/custom-envs/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: one-pod -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: one-pod diff --git a/e2e-tests/tests/custom-extensions/00-assert.yaml b/e2e-tests/tests/custom-extensions/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/custom-extensions/00-assert.yaml +++ b/e2e-tests/tests/custom-extensions/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/custom-extensions/01-assert.yaml b/e2e-tests/tests/custom-extensions/01-assert.yaml index bc775f0b59..587418552c 100644 --- a/e2e-tests/tests/custom-extensions/01-assert.yaml +++ b/e2e-tests/tests/custom-extensions/01-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-extensions ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/02-assert.yaml b/e2e-tests/tests/custom-extensions/02-assert.yaml index 99203d349a..1d085941ad 100644 --- a/e2e-tests/tests/custom-extensions/02-assert.yaml +++ b/e2e-tests/tests/custom-extensions/02-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -68,7 +68,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/02-install-pg_cron.yaml b/e2e-tests/tests/custom-extensions/02-install-pg_cron.yaml index 9f0fb7ccaf..4588331a8b 100644 --- a/e2e-tests/tests/custom-extensions/02-install-pg_cron.yaml +++ b/e2e-tests/tests/custom-extensions/02-install-pg_cron.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/05-assert.yaml b/e2e-tests/tests/custom-extensions/05-assert.yaml index 99203d349a..1d085941ad 100644 --- a/e2e-tests/tests/custom-extensions/05-assert.yaml +++ b/e2e-tests/tests/custom-extensions/05-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -68,7 +68,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/06-assert.yaml b/e2e-tests/tests/custom-extensions/06-assert.yaml index cfb18a5cbb..a2dcb64e74 100644 --- a/e2e-tests/tests/custom-extensions/06-assert.yaml +++ b/e2e-tests/tests/custom-extensions/06-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/06-uninstall-pg_cron.yaml b/e2e-tests/tests/custom-extensions/06-uninstall-pg_cron.yaml index 6e5185058f..4694c56765 100644 --- a/e2e-tests/tests/custom-extensions/06-uninstall-pg_cron.yaml +++ b/e2e-tests/tests/custom-extensions/06-uninstall-pg_cron.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/07-assert.yaml b/e2e-tests/tests/custom-extensions/07-assert.yaml index aef7ad7e6f..1a4a1f186a 100644 --- a/e2e-tests/tests/custom-extensions/07-assert.yaml +++ b/e2e-tests/tests/custom-extensions/07-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -34,7 +34,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/10-assert.yaml b/e2e-tests/tests/custom-extensions/10-assert.yaml index b01537719e..70d29f9140 100644 --- a/e2e-tests/tests/custom-extensions/10-assert.yaml +++ b/e2e-tests/tests/custom-extensions/10-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -55,7 +55,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -75,19 +75,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-extensions ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-extensions controller: true @@ -116,7 +116,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/11-assert.yaml b/e2e-tests/tests/custom-extensions/11-assert.yaml index 7183fcf975..befb147bde 100644 --- a/e2e-tests/tests/custom-extensions/11-assert.yaml +++ b/e2e-tests/tests/custom-extensions/11-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/11-install-pg_cron.yaml b/e2e-tests/tests/custom-extensions/11-install-pg_cron.yaml index 9f0fb7ccaf..4588331a8b 100644 --- a/e2e-tests/tests/custom-extensions/11-install-pg_cron.yaml +++ b/e2e-tests/tests/custom-extensions/11-install-pg_cron.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/14-assert.yaml b/e2e-tests/tests/custom-extensions/14-assert.yaml index 7183fcf975..befb147bde 100644 --- a/e2e-tests/tests/custom-extensions/14-assert.yaml +++ b/e2e-tests/tests/custom-extensions/14-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/14-update-pg_cron.yaml b/e2e-tests/tests/custom-extensions/14-update-pg_cron.yaml index 2099e58a74..177a53e5a7 100644 --- a/e2e-tests/tests/custom-extensions/14-update-pg_cron.yaml +++ b/e2e-tests/tests/custom-extensions/14-update-pg_cron.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/15-assert.yaml b/e2e-tests/tests/custom-extensions/15-assert.yaml index 8c2a26d3ab..9e50a98025 100644 --- a/e2e-tests/tests/custom-extensions/15-assert.yaml +++ b/e2e-tests/tests/custom-extensions/15-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml index 43e828dd51..5d3b478b3e 100644 --- a/e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-extensions/conf/custom-extensions.yaml b/e2e-tests/tests/custom-extensions/conf/custom-extensions.yaml index 9555f406cf..cf99ace30f 100644 --- a/e2e-tests/tests/custom-extensions/conf/custom-extensions.yaml +++ b/e2e-tests/tests/custom-extensions/conf/custom-extensions.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions diff --git a/e2e-tests/tests/custom-tls/00-assert.yaml b/e2e-tests/tests/custom-tls/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/custom-tls/00-assert.yaml +++ b/e2e-tests/tests/custom-tls/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/custom-tls/03-assert.yaml b/e2e-tests/tests/custom-tls/03-assert.yaml index 3e4e660938..7af9c436ec 100644 --- a/e2e-tests/tests/custom-tls/03-assert.yaml +++ b/e2e-tests/tests/custom-tls/03-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -53,19 +53,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-tls controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-tls diff --git a/e2e-tests/tests/custom-tls/11-assert.yaml b/e2e-tests/tests/custom-tls/11-assert.yaml index 2db32e5ffc..fbd7c973fc 100644 --- a/e2e-tests/tests/custom-tls/11-assert.yaml +++ b/e2e-tests/tests/custom-tls/11-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -31,7 +31,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '2' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -41,12 +41,12 @@ spec: status: observedGeneration: 2 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-tls controller: true @@ -56,7 +56,7 @@ metadata: status: observedGeneration: 2 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-tls diff --git a/e2e-tests/tests/custom-tls/12-assert.yaml b/e2e-tests/tests/custom-tls/12-assert.yaml index 5c16624a13..dc0c5b4286 100644 --- a/e2e-tests/tests/custom-tls/12-assert.yaml +++ b/e2e-tests/tests/custom-tls/12-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '3' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: custom-tls controller: true @@ -71,7 +71,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-tls diff --git a/e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml index c9fb138f39..58ef9bbcf1 100644 --- a/e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-tls -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls diff --git a/e2e-tests/tests/database-init-sql/00-assert.yaml b/e2e-tests/tests/database-init-sql/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/database-init-sql/00-assert.yaml +++ b/e2e-tests/tests/database-init-sql/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/database-init-sql/02-assert.yaml b/e2e-tests/tests/database-init-sql/02-assert.yaml index f21290ec4a..e8e482a44e 100644 --- a/e2e-tests/tests/database-init-sql/02-assert.yaml +++ b/e2e-tests/tests/database-init-sql/02-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: database-init-sql controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: database-init-sql controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: database-init-sql ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: database-init-sql controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: database-init-sql diff --git a/e2e-tests/tests/database-init-sql/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/database-init-sql/99-remove-cluster-gracefully.yaml index 0880d02376..59096e979c 100644 --- a/e2e-tests/tests/database-init-sql/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/database-init-sql/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: database-init-sql -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: database-init-sql diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/00-assert.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/00-assert.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/01-assert.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/01-assert.yaml index 917bc14ce2..fcf5f36f4e 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/01-assert.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: backup-snapshot controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: backup-snapshot controller: true @@ -53,19 +53,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: backup-snapshot ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: backup-snapshot controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: backup-snapshot diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/04-assert.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/04-assert.yaml index bbb4a9b018..cd2743dc76 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/04-assert.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/04-assert.yaml @@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 560 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: backup1 @@ -20,7 +20,7 @@ apiVersion: snapshot.storage.k8s.io/v1 metadata: name: backup1-pgdata ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup name: backup1 controller: true diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/04-create-backup-snapshot.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/04-create-backup-snapshot.yaml index ab38603357..db44d72b52 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/04-create-backup-snapshot.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/04-create-backup-snapshot.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: backup1 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/05-assert.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/05-assert.yaml index ec2c619a09..c177c07609 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/05-assert.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/05-assert.yaml @@ -6,7 +6,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - pgv2.percona.com/snapshot-restore: restore1 + pgv3.percona.com/snapshot-restore: restore1 labels: postgres-operator.crunchydata.com/cluster: backup-snapshot postgres-operator.crunchydata.com/role: pgdata @@ -16,14 +16,14 @@ spec: kind: VolumeSnapshot name: backup1-pgdata --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: restore1 status: state: Succeeded --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: backup-snapshot diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/05-create-restore.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/05-create-restore.yaml index 9b537d9f39..6c18b1b4cc 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/05-create-restore.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/05-create-restore.yaml @@ -12,7 +12,7 @@ commands: "postgres:$(get_psql_user_pass backup-snapshot-pguser-postgres)@$(get_psql_user_host backup-snapshot-pguser-postgres)" cat <-bootstrap -# with annotation pgv2.percona.com/cluster-bootstrap-restore=true when +# with annotation pgv3.percona.com/cluster-bootstrap-restore=true when # spec.dataSource.pgbackrest is set. Wait for it to succeed instead of # watching the underlying Job directly. -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: percona-restored-bootstrap annotations: - pgv2.percona.com/cluster-bootstrap-restore: "true" + pgv3.percona.com/cluster-bootstrap-restore: "true" status: state: Succeeded --- @@ -27,7 +27,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: percona-restored controller: true @@ -42,12 +42,12 @@ status: # upstream PostgresCluster aggregates readyReplicas across all StatefulSets (1+1+1=3). # The bootstrap restore id uses internal naming (~pgo-bootstrap-*), so we only # check finished/succeeded here and not the id field. -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: percona-restored ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: percona-restored controller: true @@ -63,7 +63,7 @@ status: finished: true succeeded: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: percona-restored diff --git a/e2e-tests/tests/migration-from-crunchy-backup-restore/06-assert.yaml b/e2e-tests/tests/migration-from-crunchy-backup-restore/06-assert.yaml index efa47905c3..7ef402a5e1 100644 --- a/e2e-tests/tests/migration-from-crunchy-backup-restore/06-assert.yaml +++ b/e2e-tests/tests/migration-from-crunchy-backup-restore/06-assert.yaml @@ -24,7 +24,7 @@ commands: echo "dataSource absent from both PerconaPGCluster and PostgresCluster" --- # Cluster must remain fully ready after the dataSource removal. -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: percona-restored diff --git a/e2e-tests/tests/migration-from-crunchy-backup-restore/07-assert.yaml b/e2e-tests/tests/migration-from-crunchy-backup-restore/07-assert.yaml index e6c87ad00d..953873b747 100644 --- a/e2e-tests/tests/migration-from-crunchy-backup-restore/07-assert.yaml +++ b/e2e-tests/tests/migration-from-crunchy-backup-restore/07-assert.yaml @@ -11,14 +11,14 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: manual postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: post-migration-backup diff --git a/e2e-tests/tests/migration-from-crunchy-backup-restore/07-backup.yaml b/e2e-tests/tests/migration-from-crunchy-backup-restore/07-backup.yaml index a2fb9cea71..06733d7d5b 100644 --- a/e2e-tests/tests/migration-from-crunchy-backup-restore/07-backup.yaml +++ b/e2e-tests/tests/migration-from-crunchy-backup-restore/07-backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: post-migration-backup diff --git a/e2e-tests/tests/migration-from-crunchy-backup-restore/08-assert.yaml b/e2e-tests/tests/migration-from-crunchy-backup-restore/08-assert.yaml index 13df5dc5da..54104d502f 100644 --- a/e2e-tests/tests/migration-from-crunchy-backup-restore/08-assert.yaml +++ b/e2e-tests/tests/migration-from-crunchy-backup-restore/08-assert.yaml @@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 600 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: post-migration-restore @@ -18,7 +18,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: percona-restored controller: true @@ -32,7 +32,7 @@ status: # For user-triggered restores the upstream operator sets restore.id to the # PerconaPGRestore CR name (unlike bootstrap restores which use ~pgo-bootstrap-*). # Cluster was scaled to 1 before restore; step 09 scales back to 3. -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: percona-restored @@ -49,7 +49,7 @@ status: succeeded: 1 --- # cluster must be fully ready again after the restore-triggered restart -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: percona-restored diff --git a/e2e-tests/tests/migration-from-crunchy-backup-restore/08-restore.yaml b/e2e-tests/tests/migration-from-crunchy-backup-restore/08-restore.yaml index 5f712a9738..ef52080d3c 100644 --- a/e2e-tests/tests/migration-from-crunchy-backup-restore/08-restore.yaml +++ b/e2e-tests/tests/migration-from-crunchy-backup-restore/08-restore.yaml @@ -66,7 +66,7 @@ commands: # Restore to the step-07 backup point; post-backup rows must disappear. cat < ${TEMP_DIR}/restore.yaml - apiVersion: pgv2.percona.com/v2 + apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: repo1-restore diff --git a/e2e-tests/tests/scheduled-backup/14-assert.yaml b/e2e-tests/tests/scheduled-backup/14-assert.yaml index 04ac75c4eb..8b3e710fa9 100644 --- a/e2e-tests/tests/scheduled-backup/14-assert.yaml +++ b/e2e-tests/tests/scheduled-backup/14-assert.yaml @@ -2,13 +2,13 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 380 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: scheduled-backup generation: 13 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: scheduled-backup controller: true @@ -40,7 +40,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: repo2-restore diff --git a/e2e-tests/tests/scheduled-backup/14-start-repo2-restore.yaml b/e2e-tests/tests/scheduled-backup/14-start-repo2-restore.yaml index fdd72d0423..07b4a7e317 100644 --- a/e2e-tests/tests/scheduled-backup/14-start-repo2-restore.yaml +++ b/e2e-tests/tests/scheduled-backup/14-start-repo2-restore.yaml @@ -8,7 +8,7 @@ commands: source ../../functions cat << EOF > ${TEMP_DIR}/restore.yaml - apiVersion: pgv2.percona.com/v2 + apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: repo2-restore diff --git a/e2e-tests/tests/scheduled-backup/17-assert.yaml b/e2e-tests/tests/scheduled-backup/17-assert.yaml index 818916ddcf..fa68d00f15 100644 --- a/e2e-tests/tests/scheduled-backup/17-assert.yaml +++ b/e2e-tests/tests/scheduled-backup/17-assert.yaml @@ -2,13 +2,13 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 380 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: scheduled-backup generation: 15 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: scheduled-backup controller: true @@ -40,7 +40,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: repo3-restore diff --git a/e2e-tests/tests/scheduled-backup/17-start-repo3-restore.yaml b/e2e-tests/tests/scheduled-backup/17-start-repo3-restore.yaml index 79dfcdc769..00f0286a14 100644 --- a/e2e-tests/tests/scheduled-backup/17-start-repo3-restore.yaml +++ b/e2e-tests/tests/scheduled-backup/17-start-repo3-restore.yaml @@ -8,7 +8,7 @@ commands: source ../../functions cat << EOF > ${TEMP_DIR}/restore.yaml - apiVersion: pgv2.percona.com/v2 + apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: repo3-restore diff --git a/e2e-tests/tests/scheduled-backup/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/scheduled-backup/99-remove-cluster-gracefully.yaml index 771ef5661b..5aa9fe0819 100644 --- a/e2e-tests/tests/scheduled-backup/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/scheduled-backup/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: scheduled-backup -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: scheduled-backup diff --git a/e2e-tests/tests/scheduled-backup/conf/scheduled-backup-spaces.yaml b/e2e-tests/tests/scheduled-backup/conf/scheduled-backup-spaces.yaml index 978bb2d78c..024c59b221 100644 --- a/e2e-tests/tests/scheduled-backup/conf/scheduled-backup-spaces.yaml +++ b/e2e-tests/tests/scheduled-backup/conf/scheduled-backup-spaces.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/scheduled-backup/conf/scheduled-backup.yaml b/e2e-tests/tests/scheduled-backup/conf/scheduled-backup.yaml index 2e418daaaf..76caa38164 100644 --- a/e2e-tests/tests/scheduled-backup/conf/scheduled-backup.yaml +++ b/e2e-tests/tests/scheduled-backup/conf/scheduled-backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name diff --git a/e2e-tests/tests/self-healing/00-assert.yaml b/e2e-tests/tests/self-healing/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/self-healing/00-assert.yaml +++ b/e2e-tests/tests/self-healing/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/self-healing/02-assert.yaml b/e2e-tests/tests/self-healing/02-assert.yaml index e2fe1ee5df..f064a5f4b6 100644 --- a/e2e-tests/tests/self-healing/02-assert.yaml +++ b/e2e-tests/tests/self-healing/02-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing diff --git a/e2e-tests/tests/self-healing/05-assert.yaml b/e2e-tests/tests/self-healing/05-assert.yaml index 8e4f5a5f3d..68d374df67 100644 --- a/e2e-tests/tests/self-healing/05-assert.yaml +++ b/e2e-tests/tests/self-healing/05-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing diff --git a/e2e-tests/tests/self-healing/08-assert.yaml b/e2e-tests/tests/self-healing/08-assert.yaml index 8e4f5a5f3d..68d374df67 100644 --- a/e2e-tests/tests/self-healing/08-assert.yaml +++ b/e2e-tests/tests/self-healing/08-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing diff --git a/e2e-tests/tests/self-healing/11-assert.yaml b/e2e-tests/tests/self-healing/11-assert.yaml index 8e4f5a5f3d..68d374df67 100644 --- a/e2e-tests/tests/self-healing/11-assert.yaml +++ b/e2e-tests/tests/self-healing/11-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing diff --git a/e2e-tests/tests/self-healing/14-assert.yaml b/e2e-tests/tests/self-healing/14-assert.yaml index 8e4f5a5f3d..68d374df67 100644 --- a/e2e-tests/tests/self-healing/14-assert.yaml +++ b/e2e-tests/tests/self-healing/14-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing diff --git a/e2e-tests/tests/self-healing/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/self-healing/99-remove-cluster-gracefully.yaml index 7e5e4620c4..77eddc2b59 100644 --- a/e2e-tests/tests/self-healing/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/self-healing/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing diff --git a/e2e-tests/tests/sidecars/00-assert.yaml b/e2e-tests/tests/sidecars/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/sidecars/00-assert.yaml +++ b/e2e-tests/tests/sidecars/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/sidecars/01-assert.yaml b/e2e-tests/tests/sidecars/01-assert.yaml index 9467d0a230..7202c9e7ce 100644 --- a/e2e-tests/tests/sidecars/01-assert.yaml +++ b/e2e-tests/tests/sidecars/01-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: sidecars controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: sidecars controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: sidecars controller: true @@ -76,19 +76,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: sidecars ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: sidecars controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: labels: @@ -222,7 +222,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.1.0 + pgv3.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: sidecars postgres-operator.crunchydata.com/pgbackrest: "" name: sidecar-repohost-claim diff --git a/e2e-tests/tests/sidecars/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/sidecars/99-remove-cluster-gracefully.yaml index 8ae7e18df1..8cd497fda2 100644 --- a/e2e-tests/tests/sidecars/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/sidecars/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing diff --git a/e2e-tests/tests/standby-pgbackrest/00-assert.yaml b/e2e-tests/tests/standby-pgbackrest/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/standby-pgbackrest/00-assert.yaml +++ b/e2e-tests/tests/standby-pgbackrest/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/standby-pgbackrest/01-assert.yaml b/e2e-tests/tests/standby-pgbackrest/01-assert.yaml index 9b80c796d3..247c87d1e9 100644 --- a/e2e-tests/tests/standby-pgbackrest/01-assert.yaml +++ b/e2e-tests/tests/standby-pgbackrest/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -30,7 +30,7 @@ metadata: postgres-operator.crunchydata.com/cluster: source-cluster postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: source-cluster controller: true @@ -50,19 +50,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: source-cluster ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: source-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster diff --git a/e2e-tests/tests/standby-pgbackrest/02-assert.yaml b/e2e-tests/tests/standby-pgbackrest/02-assert.yaml index c9e8e72dfd..f8f6847411 100644 --- a/e2e-tests/tests/standby-pgbackrest/02-assert.yaml +++ b/e2e-tests/tests/standby-pgbackrest/02-assert.yaml @@ -3,7 +3,7 @@ kind: TestAssert timeout: 480 command: - script: |- - kubectl wait --for=jsonpath='{.metadata.annotations["pgv2.percona.com/replication-main-site"]}'="${NAMESPACE}"/source-cluster --timeout=480s -n "${NAMESPACE}" pg/standby-cluster + kubectl wait --for=jsonpath='{.metadata.annotations["pgv3.percona.com/replication-main-site"]}'="${NAMESPACE}"/source-cluster --timeout=480s -n "${NAMESPACE}" pg/standby-cluster --- apiVersion: apps/v1 kind: StatefulSet @@ -13,7 +13,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/cluster: standby-cluster postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster controller: true @@ -44,12 +44,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -71,7 +71,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster diff --git a/e2e-tests/tests/standby-pgbackrest/10-assert.yaml b/e2e-tests/tests/standby-pgbackrest/10-assert.yaml index 87b803c035..8e81a5c632 100644 --- a/e2e-tests/tests/standby-pgbackrest/10-assert.yaml +++ b/e2e-tests/tests/standby-pgbackrest/10-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -30,7 +30,7 @@ metadata: postgres-operator.crunchydata.com/cluster: standby-cluster postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster controller: true @@ -50,19 +50,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster diff --git a/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml b/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml index 82e668d093..3e6e68249d 100644 --- a/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml +++ b/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml @@ -2,18 +2,18 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep timeout: 300 delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: source-cluster -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster commands: diff --git a/e2e-tests/tests/standby-pgbackrest/conf/source-cluster-spaces.yaml b/e2e-tests/tests/standby-pgbackrest/conf/source-cluster-spaces.yaml index 19c553d45c..16e37513a5 100644 --- a/e2e-tests/tests/standby-pgbackrest/conf/source-cluster-spaces.yaml +++ b/e2e-tests/tests/standby-pgbackrest/conf/source-cluster-spaces.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster diff --git a/e2e-tests/tests/standby-pgbackrest/conf/source-cluster.yaml b/e2e-tests/tests/standby-pgbackrest/conf/source-cluster.yaml index 5bca8ea149..31e22f0bcd 100644 --- a/e2e-tests/tests/standby-pgbackrest/conf/source-cluster.yaml +++ b/e2e-tests/tests/standby-pgbackrest/conf/source-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster diff --git a/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster-spaces.yaml b/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster-spaces.yaml index f8b99bd706..001f96c866 100644 --- a/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster-spaces.yaml +++ b/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster-spaces.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster diff --git a/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster.yaml b/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster.yaml index adfac6c34e..7d12792227 100644 --- a/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster.yaml +++ b/e2e-tests/tests/standby-pgbackrest/conf/standby-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster diff --git a/e2e-tests/tests/standby-streaming/00-assert.yaml b/e2e-tests/tests/standby-streaming/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/standby-streaming/00-assert.yaml +++ b/e2e-tests/tests/standby-streaming/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/standby-streaming/01-assert.yaml b/e2e-tests/tests/standby-streaming/01-assert.yaml index 9b80c796d3..247c87d1e9 100644 --- a/e2e-tests/tests/standby-streaming/01-assert.yaml +++ b/e2e-tests/tests/standby-streaming/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -30,7 +30,7 @@ metadata: postgres-operator.crunchydata.com/cluster: source-cluster postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: source-cluster controller: true @@ -50,19 +50,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: source-cluster ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: source-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster diff --git a/e2e-tests/tests/standby-streaming/02-assert.yaml b/e2e-tests/tests/standby-streaming/02-assert.yaml index c9e8e72dfd..f8f6847411 100644 --- a/e2e-tests/tests/standby-streaming/02-assert.yaml +++ b/e2e-tests/tests/standby-streaming/02-assert.yaml @@ -3,7 +3,7 @@ kind: TestAssert timeout: 480 command: - script: |- - kubectl wait --for=jsonpath='{.metadata.annotations["pgv2.percona.com/replication-main-site"]}'="${NAMESPACE}"/source-cluster --timeout=480s -n "${NAMESPACE}" pg/standby-cluster + kubectl wait --for=jsonpath='{.metadata.annotations["pgv3.percona.com/replication-main-site"]}'="${NAMESPACE}"/source-cluster --timeout=480s -n "${NAMESPACE}" pg/standby-cluster --- apiVersion: apps/v1 kind: StatefulSet @@ -13,7 +13,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/cluster: standby-cluster postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster controller: true @@ -44,12 +44,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -71,7 +71,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster diff --git a/e2e-tests/tests/standby-streaming/10-assert.yaml b/e2e-tests/tests/standby-streaming/10-assert.yaml index 87b803c035..8e81a5c632 100644 --- a/e2e-tests/tests/standby-streaming/10-assert.yaml +++ b/e2e-tests/tests/standby-streaming/10-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -30,7 +30,7 @@ metadata: postgres-operator.crunchydata.com/cluster: standby-cluster postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster controller: true @@ -50,19 +50,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster diff --git a/e2e-tests/tests/standby-streaming/99-cleanup.yaml b/e2e-tests/tests/standby-streaming/99-cleanup.yaml index 82e668d093..3e6e68249d 100644 --- a/e2e-tests/tests/standby-streaming/99-cleanup.yaml +++ b/e2e-tests/tests/standby-streaming/99-cleanup.yaml @@ -2,18 +2,18 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep timeout: 300 delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: source-cluster -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster commands: diff --git a/e2e-tests/tests/start-from-backup/00-assert.yaml b/e2e-tests/tests/start-from-backup/00-assert.yaml index 72235e683b..7cf832ff36 100644 --- a/e2e-tests/tests/start-from-backup/00-assert.yaml +++ b/e2e-tests/tests/start-from-backup/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/start-from-backup/01-assert.yaml b/e2e-tests/tests/start-from-backup/01-assert.yaml index c82daeba9b..124efa27ce 100644 --- a/e2e-tests/tests/start-from-backup/01-assert.yaml +++ b/e2e-tests/tests/start-from-backup/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: start-from-backup-source controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: start-from-backup-source controller: true @@ -53,19 +53,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: start-from-backup-source ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: start-from-backup-source controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup-source diff --git a/e2e-tests/tests/start-from-backup/04-assert.yaml b/e2e-tests/tests/start-from-backup/04-assert.yaml index 6acec781d3..c542ab6cde 100644 --- a/e2e-tests/tests/start-from-backup/04-assert.yaml +++ b/e2e-tests/tests/start-from-backup/04-assert.yaml @@ -11,14 +11,14 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: manual postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: start-from-backup-source-full-repo1 @@ -30,7 +30,7 @@ spec: status: state: Succeeded --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: start-from-backup-source diff --git a/e2e-tests/tests/start-from-backup/04-create-backup-repo1.yaml b/e2e-tests/tests/start-from-backup/04-create-backup-repo1.yaml index bff684f703..72ee654546 100644 --- a/e2e-tests/tests/start-from-backup/04-create-backup-repo1.yaml +++ b/e2e-tests/tests/start-from-backup/04-create-backup-repo1.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: start-from-backup-source-full-repo1 diff --git a/e2e-tests/tests/start-from-backup/05-delete-source-cluster.yaml b/e2e-tests/tests/start-from-backup/05-delete-source-cluster.yaml index b85650b356..4372d9d8cf 100644 --- a/e2e-tests/tests/start-from-backup/05-delete-source-cluster.yaml +++ b/e2e-tests/tests/start-from-backup/05-delete-source-cluster.yaml @@ -1,10 +1,10 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: start-from-backup-source -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: start-from-backup-source timeout: 300 diff --git a/e2e-tests/tests/start-from-backup/06-assert.yaml b/e2e-tests/tests/start-from-backup/06-assert.yaml index bdda45643b..40fad5b882 100644 --- a/e2e-tests/tests/start-from-backup/06-assert.yaml +++ b/e2e-tests/tests/start-from-backup/06-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: start-from-backup controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: start-from-backup controller: true @@ -53,19 +53,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: start-from-backup ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: start-from-backup controller: true @@ -91,7 +91,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup @@ -108,7 +108,7 @@ status: size: 3 state: ready --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: start-from-backup-bootstrap diff --git a/e2e-tests/tests/start-from-backup/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/start-from-backup/99-remove-cluster-gracefully.yaml index bf732320bb..5e8cd77571 100644 --- a/e2e-tests/tests/start-from-backup/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/start-from-backup/99-remove-cluster-gracefully.yaml @@ -1,11 +1,11 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv2.percona.com/v2 +- apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: start-from-backup diff --git a/e2e-tests/tests/start-from-backup/conf/start-from-backup-source-spaces.yaml b/e2e-tests/tests/start-from-backup/conf/start-from-backup-source-spaces.yaml index 46bb81bfdc..213c92987c 100644 --- a/e2e-tests/tests/start-from-backup/conf/start-from-backup-source-spaces.yaml +++ b/e2e-tests/tests/start-from-backup/conf/start-from-backup-source-spaces.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup-source diff --git a/e2e-tests/tests/start-from-backup/conf/start-from-backup-source.yaml b/e2e-tests/tests/start-from-backup/conf/start-from-backup-source.yaml index 047c836728..ada4eb43ff 100644 --- a/e2e-tests/tests/start-from-backup/conf/start-from-backup-source.yaml +++ b/e2e-tests/tests/start-from-backup/conf/start-from-backup-source.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup-source diff --git a/e2e-tests/tests/start-from-backup/conf/start-from-backup-spaces.yaml b/e2e-tests/tests/start-from-backup/conf/start-from-backup-spaces.yaml index 02c7014cc7..6284ee6cb6 100644 --- a/e2e-tests/tests/start-from-backup/conf/start-from-backup-spaces.yaml +++ b/e2e-tests/tests/start-from-backup/conf/start-from-backup-spaces.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup diff --git a/e2e-tests/tests/start-from-backup/conf/start-from-backup.yaml b/e2e-tests/tests/start-from-backup/conf/start-from-backup.yaml index 49012798e6..d77996a240 100644 --- a/e2e-tests/tests/start-from-backup/conf/start-from-backup.yaml +++ b/e2e-tests/tests/start-from-backup/conf/start-from-backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup diff --git a/e2e-tests/tests/tablespaces/00-assert.yaml b/e2e-tests/tests/tablespaces/00-assert.yaml index ae5a062d84..c35ff62c91 100644 --- a/e2e-tests/tests/tablespaces/00-assert.yaml +++ b/e2e-tests/tests/tablespaces/00-assert.yaml @@ -5,9 +5,9 @@ timeout: 120 apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: perconapgclusters.pgv2.percona.com + name: perconapgclusters.pgv3.percona.com spec: - group: pgv2.percona.com + group: pgv3.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/e2e-tests/tests/tablespaces/01-assert.yaml b/e2e-tests/tests/tablespaces/01-assert.yaml index a97cb5e5d8..1e1b3a0005 100644 --- a/e2e-tests/tests/tablespaces/01-assert.yaml +++ b/e2e-tests/tests/tablespaces/01-assert.yaml @@ -10,7 +10,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: tablespaces controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster name: tablespaces controller: true @@ -53,19 +53,19 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: tablespaces ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: tablespaces controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: tablespaces diff --git a/e2e-tests/tests/tablespaces/05-assert.yaml b/e2e-tests/tests/tablespaces/05-assert.yaml index 707df43209..ac63c295b7 100644 --- a/e2e-tests/tests/tablespaces/05-assert.yaml +++ b/e2e-tests/tests/tablespaces/05-assert.yaml @@ -11,14 +11,14 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: manual postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: tablespaces-full diff --git a/e2e-tests/tests/tablespaces/05-create-backup.yaml b/e2e-tests/tests/tablespaces/05-create-backup.yaml index df0ed18190..b6a15cf386 100644 --- a/e2e-tests/tests/tablespaces/05-create-backup.yaml +++ b/e2e-tests/tests/tablespaces/05-create-backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGBackup metadata: name: tablespaces-full diff --git a/e2e-tests/tests/tablespaces/08-assert.yaml b/e2e-tests/tests/tablespaces/08-assert.yaml index e6292cd6df..ef7b0f0009 100644 --- a/e2e-tests/tests/tablespaces/08-assert.yaml +++ b/e2e-tests/tests/tablespaces/08-assert.yaml @@ -2,13 +2,13 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 180 --- -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: name: tablespaces generation: 4 ownerReferences: - - apiVersion: pgv2.percona.com/v2 + - apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster name: tablespaces controller: true @@ -36,7 +36,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGRestore metadata: name: tablespaces-restore diff --git a/e2e-tests/tests/tablespaces/08-create-restore.yaml b/e2e-tests/tests/tablespaces/08-create-restore.yaml index 8ab23dde7d..9be722311d 100644 --- a/e2e-tests/tests/tablespaces/08-create-restore.yaml +++ b/e2e-tests/tests/tablespaces/08-create-restore.yaml @@ -11,7 +11,7 @@ commands: latest_full_backup=$(kubectl -n ${NAMESPACE} exec ${primary} -- pgbackrest info --output json | jq '[.[] | .backup[] | select(.type == "full")][-1].label') cat < "${clusters_dir}/todos.yaml" + "${clusters_dir}/generated/upstream.pgv3.percona.com_postgresclusters.yaml" > "${clusters_dir}/todos.yaml" python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_without_todo}" ' [{ op: "add", path: "/work", value: $new }] + [paths(select(. == $old)) | { op: "copy", from: "/work", path: "/\(map(tostring) | join("/"))" }] + [{ op: "remove", path: "/work" }] ' \ - "${upgrades_dir}/generated/upstream.pgv2.percona.com_pgupgrades.yaml" > "${upgrades_dir}/todos.yaml" + "${upgrades_dir}/generated/upstream.pgv3.percona.com_pgupgrades.yaml" > "${upgrades_dir}/todos.yaml" diff --git a/installers/olm/config/examples/pgadmin.example.yaml b/installers/olm/config/examples/pgadmin.example.yaml index c9541913ed..ff872935ec 100644 --- a/installers/olm/config/examples/pgadmin.example.yaml +++ b/installers/olm/config/examples/pgadmin.example.yaml @@ -1,4 +1,4 @@ -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PGAdmin metadata: name: example-pgadmin diff --git a/installers/olm/config/examples/pgupgrade.example.yaml b/installers/olm/config/examples/pgupgrade.example.yaml index 6465eadf02..740d212b83 100644 --- a/installers/olm/config/examples/pgupgrade.example.yaml +++ b/installers/olm/config/examples/pgupgrade.example.yaml @@ -1,4 +1,4 @@ -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PGUpgrade metadata: name: example-upgrade diff --git a/installers/olm/config/examples/postgrescluster.example.yaml b/installers/olm/config/examples/postgrescluster.example.yaml index 63bd9abca4..b4969a8fa2 100644 --- a/installers/olm/config/examples/postgrescluster.example.yaml +++ b/installers/olm/config/examples/postgrescluster.example.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: example diff --git a/internal/bridge/client.go b/internal/bridge/client.go index a0831a9736..51100d432c 100644 --- a/internal/bridge/client.go +++ b/internal/bridge/client.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const defaultAPI = "https://api.crunchybridge.com" diff --git a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go index 9e567d4236..5c4505b1f1 100644 --- a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go +++ b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go @@ -21,10 +21,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/event" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + pgoRuntime "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // CrunchyBridgeClusterReconciler reconciles a CrunchyBridgeCluster object @@ -42,7 +42,7 @@ type CrunchyBridgeClusterReconciler struct { NewClient func() bridge.ClientInterface } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters",verbs={list,watch} //+kubebuilder:rbac:groups="",resources="secrets",verbs={list,watch} // SetupWithManager sets up the controller with the Manager. @@ -71,7 +71,7 @@ func (r *CrunchyBridgeClusterReconciler) SetupWithManager( // creator of such a reference have either "delete" permission on the owner or // "update" permission on the owner's "finalizers" subresource. // - https://docs.k8s.io/reference/access-authn-authz/admission-controllers/ -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters/finalizers",verbs={update} // setControllerReference sets owner as a Controller OwnerReference on controlled. // Only one OwnerReference can be a controller, so it returns an error if another @@ -82,9 +82,9 @@ func (r *CrunchyBridgeClusterReconciler) setControllerReference( return controllerutil.SetControllerReference(owner, controlled, r.Client.Scheme()) } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters",verbs={get,patch,update} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters/status",verbs={patch,update} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters/finalizers",verbs={patch,update} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters",verbs={get,patch,update} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters/status",verbs={patch,update} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters/finalizers",verbs={patch,update} //+kubebuilder:rbac:groups="",resources="secrets",verbs={get} // Reconcile does the work to move the current state of the world toward the diff --git a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go index 23d352ffab..d7d51e6af9 100644 --- a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go +++ b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go @@ -19,11 +19,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/bridge" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var testTeamId = "5678" diff --git a/internal/bridge/crunchybridgecluster/delete.go b/internal/bridge/crunchybridgecluster/delete.go index 27a3384ea2..82a5f518e8 100644 --- a/internal/bridge/crunchybridgecluster/delete.go +++ b/internal/bridge/crunchybridgecluster/delete.go @@ -11,8 +11,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const finalizer = "crunchybridgecluster.postgres-operator.crunchydata.com/finalizer" diff --git a/internal/bridge/crunchybridgecluster/delete_test.go b/internal/bridge/crunchybridgecluster/delete_test.go index bbc0d6036a..376d3edc33 100644 --- a/internal/bridge/crunchybridgecluster/delete_test.go +++ b/internal/bridge/crunchybridgecluster/delete_test.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/bridge" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) func TestHandleDeleteCluster(t *testing.T) { diff --git a/internal/bridge/crunchybridgecluster/helpers_test.go b/internal/bridge/crunchybridgecluster/helpers_test.go index 9327d8a82e..2f8175818e 100644 --- a/internal/bridge/crunchybridgecluster/helpers_test.go +++ b/internal/bridge/crunchybridgecluster/helpers_test.go @@ -17,9 +17,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/bridge" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // Scale extends d according to PGO_TEST_TIMEOUT_SCALE. diff --git a/internal/bridge/crunchybridgecluster/mock_bridge_api.go b/internal/bridge/crunchybridgecluster/mock_bridge_api.go index 4dfe2ebc89..f568b7d196 100644 --- a/internal/bridge/crunchybridgecluster/mock_bridge_api.go +++ b/internal/bridge/crunchybridgecluster/mock_bridge_api.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/internal/bridge" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type TestBridgeClient struct { diff --git a/internal/bridge/crunchybridgecluster/postgres.go b/internal/bridge/crunchybridgecluster/postgres.go index e4cdb7f224..44b811a205 100644 --- a/internal/bridge/crunchybridgecluster/postgres.go +++ b/internal/bridge/crunchybridgecluster/postgres.go @@ -15,9 +15,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/bridge" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // generatePostgresRoleSecret returns a Secret containing a password and diff --git a/internal/bridge/crunchybridgecluster/postgres_test.go b/internal/bridge/crunchybridgecluster/postgres_test.go index 30bef9669a..8ae3bd2b3d 100644 --- a/internal/bridge/crunchybridgecluster/postgres_test.go +++ b/internal/bridge/crunchybridgecluster/postgres_test.go @@ -15,9 +15,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/bridge" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/bridge" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePostgresRoleSecret(t *testing.T) { diff --git a/internal/bridge/crunchybridgecluster/watches.go b/internal/bridge/crunchybridgecluster/watches.go index 03899138f3..5219e41a19 100644 --- a/internal/bridge/crunchybridgecluster/watches.go +++ b/internal/bridge/crunchybridgecluster/watches.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // watchForRelatedSecret handles create/update/delete events for secrets, @@ -49,7 +49,7 @@ func (r *CrunchyBridgeClusterReconciler) watchForRelatedSecret() handler.EventHa } } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters",verbs={list} // findCrunchyBridgeClustersForSecret returns CrunchyBridgeClusters // that are connected to the Secret @@ -75,7 +75,7 @@ func (r *CrunchyBridgeClusterReconciler) findCrunchyBridgeClustersForSecret( return matching } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters",verbs={list} // Watch enqueues all existing CrunchyBridgeClusters for reconciles. func (r *CrunchyBridgeClusterReconciler) Watch() handler.EventHandler { diff --git a/internal/bridge/crunchybridgecluster/watches_test.go b/internal/bridge/crunchybridgecluster/watches_test.go index bc91930f75..6318c2d78a 100644 --- a/internal/bridge/crunchybridgecluster/watches_test.go +++ b/internal/bridge/crunchybridgecluster/watches_test.go @@ -12,7 +12,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) func TestFindCrunchyBridgeClustersForSecret(t *testing.T) { diff --git a/internal/bridge/installation.go b/internal/bridge/installation.go index bdfe494d4e..bddbfefe8d 100644 --- a/internal/bridge/installation.go +++ b/internal/bridge/installation.go @@ -25,9 +25,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" ) // self is a singleton Installation. See [InstallationReconciler]. diff --git a/internal/bridge/installation_test.go b/internal/bridge/installation_test.go index 88dddf855d..5c9a6de34f 100644 --- a/internal/bridge/installation_test.go +++ b/internal/bridge/installation_test.go @@ -20,8 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) func TestExtractSecretContract(t *testing.T) { diff --git a/internal/config/config.go b/internal/config/config.go index e62c0bf9f1..087fb5cd9e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // defaultFromEnv reads the environment variable key when value is empty. diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 9ecc59c1cd..fb06c99579 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -12,7 +12,7 @@ import ( "gotest.tools/v3/assert" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestFetchKeyCommand(t *testing.T) { diff --git a/internal/controller/pgupgrade/jobs.go b/internal/controller/pgupgrade/jobs.go index f3a00bb9c5..d9af543c65 100644 --- a/internal/controller/pgupgrade/jobs.go +++ b/internal/controller/pgupgrade/jobs.go @@ -17,10 +17,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "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/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // Upgrade job diff --git a/internal/controller/pgupgrade/jobs_test.go b/internal/controller/pgupgrade/jobs_test.go index 27a71c5a97..d8ecee3ce0 100644 --- a/internal/controller/pgupgrade/jobs_test.go +++ b/internal/controller/pgupgrade/jobs_test.go @@ -16,9 +16,9 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestLargestWholeCPU(t *testing.T) { @@ -155,7 +155,7 @@ metadata: name: pgu2-pgdata namespace: ns1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PGUpgrade @@ -307,7 +307,7 @@ metadata: name: pgu2-sts namespace: ns1 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PGUpgrade diff --git a/internal/controller/pgupgrade/labels.go b/internal/controller/pgupgrade/labels.go index bb80731e55..6d02f52643 100644 --- a/internal/controller/pgupgrade/labels.go +++ b/internal/controller/pgupgrade/labels.go @@ -5,7 +5,7 @@ package pgupgrade import ( - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/controller/pgupgrade/pgupgrade_controller.go b/internal/controller/pgupgrade/pgupgrade_controller.go index 7887c6cf00..f5df84c847 100644 --- a/internal/controller/pgupgrade/pgupgrade_controller.go +++ b/internal/controller/pgupgrade/pgupgrade_controller.go @@ -21,10 +21,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/registration" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/registration" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( @@ -41,8 +41,8 @@ type PGUpgradeReconciler struct { } //+kubebuilder:rbac:groups="batch",resources="jobs",verbs={list,watch} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgupgrades",verbs={list,watch} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgupgrades",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={list,watch} // SetupWithManager sets up the controller with the Manager. func (r *PGUpgradeReconciler) SetupWithManager(mgr ctrl.Manager) error { @@ -56,7 +56,7 @@ func (r *PGUpgradeReconciler) SetupWithManager(mgr ctrl.Manager) error { Complete(r) } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgupgrades",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgupgrades",verbs={list} // findUpgradesForPostgresCluster returns PGUpgrades that target cluster. func (r *PGUpgradeReconciler) findUpgradesForPostgresCluster( @@ -106,11 +106,11 @@ func (r *PGUpgradeReconciler) watchPostgresClusters() handler.Funcs { } } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgupgrades",verbs={get} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgupgrades/status",verbs={patch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgupgrades",verbs={get} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgupgrades/status",verbs={patch} //+kubebuilder:rbac:groups="batch",resources="jobs",verbs={delete} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={get} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters/status",verbs={patch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={get} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters/status",verbs={patch} //+kubebuilder:rbac:groups="batch",resources="jobs",verbs={create,patch} //+kubebuilder:rbac:groups="batch",resources="jobs",verbs={list} //+kubebuilder:rbac:groups="",resources="endpoints",verbs={get} diff --git a/internal/controller/pgupgrade/registration.go b/internal/controller/pgupgrade/registration.go index 9f979e3205..30dca7fa36 100644 --- a/internal/controller/pgupgrade/registration.go +++ b/internal/controller/pgupgrade/registration.go @@ -7,8 +7,8 @@ package pgupgrade import ( "k8s.io/apimachinery/pkg/api/meta" - "github.com/percona/percona-postgresql-operator/v2/internal/registration" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/registration" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func (r *PGUpgradeReconciler) UpgradeAuthorized(upgrade *v1beta1.PGUpgrade) bool { diff --git a/internal/controller/pgupgrade/registration_test.go b/internal/controller/pgupgrade/registration_test.go index 050f972f8a..ac0d119157 100644 --- a/internal/controller/pgupgrade/registration_test.go +++ b/internal/controller/pgupgrade/registration_test.go @@ -13,11 +13,11 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/registration" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/registration" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestUpgradeAuthorized(t *testing.T) { diff --git a/internal/controller/pgupgrade/utils.go b/internal/controller/pgupgrade/utils.go index 0e0434e238..f212e009b0 100644 --- a/internal/controller/pgupgrade/utils.go +++ b/internal/controller/pgupgrade/utils.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // The owner reference created by controllerutil.SetControllerReference blocks @@ -20,7 +20,7 @@ import ( // creator of such a reference have either "delete" permission on the owner or // "update" permission on the owner's "finalizers" subresource. // - https://docs.k8s.io/reference/access-authn-authz/admission-controllers/ -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgupgrades/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgupgrades/finalizers",verbs={update} // setControllerReference sets owner as a Controller OwnerReference on controlled. // It panics if another controller is already set. diff --git a/internal/controller/pgupgrade/world.go b/internal/controller/pgupgrade/world.go index 98c6832b7f..64a37a07d0 100644 --- a/internal/controller/pgupgrade/world.go +++ b/internal/controller/pgupgrade/world.go @@ -15,14 +15,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // The client used by the controller sets up a cache and an informer for any GVK // that it GETs. That informer needs the "watch" permission. // - https://github.com/kubernetes-sigs/controller-runtime/issues/1249 // - https://github.com/kubernetes-sigs/controller-runtime/issues/1454 -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={get,watch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={get,watch} //+kubebuilder:rbac:groups="",resources="endpoints",verbs={list,watch} //+kubebuilder:rbac:groups="batch",resources="jobs",verbs={list,watch} //+kubebuilder:rbac:groups="apps",resources="statefulsets",verbs={list,watch} diff --git a/internal/controller/pgupgrade/world_test.go b/internal/controller/pgupgrade/world_test.go index ef42b91837..1ef489edec 100644 --- a/internal/controller/pgupgrade/world_test.go +++ b/internal/controller/pgupgrade/world_test.go @@ -14,8 +14,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPopulateCluster(t *testing.T) { diff --git a/internal/controller/postgrescluster/apply.go b/internal/controller/postgrescluster/apply.go index a923856e66..e54b1918a5 100644 --- a/internal/controller/postgrescluster/apply.go +++ b/internal/controller/postgrescluster/apply.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/kubeapi" + "github.com/percona/percona-postgresql-operator/v3/internal/kubeapi" ) // apply sends an apply patch to object's endpoint in the Kubernetes API and diff --git a/internal/controller/postgrescluster/apply_test.go b/internal/controller/postgrescluster/apply_test.go index d41148ae43..d76149a243 100644 --- a/internal/controller/postgrescluster/apply_test.go +++ b/internal/controller/postgrescluster/apply_test.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) func TestServerSideApply(t *testing.T) { diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go index a8e4f56e2c..462bc8e537 100644 --- a/internal/controller/postgrescluster/cluster.go +++ b/internal/controller/postgrescluster/cluster.go @@ -14,12 +14,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "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/patroni" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/patroni" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="",resources="configmaps",verbs={create,patch} diff --git a/internal/controller/postgrescluster/cluster_test.go b/internal/controller/postgrescluster/cluster_test.go index fb6eb19a1e..0c720ea16f 100644 --- a/internal/controller/postgrescluster/cluster_test.go +++ b/internal/controller/postgrescluster/cluster_test.go @@ -20,11 +20,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "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/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var gvks = []runtime.GVK{{ @@ -613,7 +613,7 @@ labels: name: pg5-primary namespace: ns2 ownerReferences: -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -646,7 +646,7 @@ metadata: name: pg5-primary namespace: ns2 ownerReferences: - - apiVersion: upstream.pgv2.percona.com/v1beta1 + - apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -745,7 +745,7 @@ labels: name: pg2-replicas namespace: ns1 ownerReferences: -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/controller.go b/internal/controller/postgrescluster/controller.go index 9ab3477bd1..8be626474b 100644 --- a/internal/controller/postgrescluster/controller.go +++ b/internal/controller/postgrescluster/controller.go @@ -38,26 +38,26 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pgaudit" - "github.com/percona/percona-postgresql-operator/v2/internal/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/pgbouncer" - "github.com/percona/percona-postgresql-operator/v2/internal/pgcron" - "github.com/percona/percona-postgresql-operator/v2/internal/pgmonitor" - "github.com/percona/percona-postgresql-operator/v2/internal/pgstatmonitor" - "github.com/percona/percona-postgresql-operator/v2/internal/pgstatstatements" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/pmm" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/internal/registration" - "github.com/percona/percona-postgresql-operator/v2/internal/setuser" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgaudit" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbouncer" + "github.com/percona/percona-postgresql-operator/v3/internal/pgcron" + "github.com/percona/percona-postgresql-operator/v3/internal/pgmonitor" + "github.com/percona/percona-postgresql-operator/v3/internal/pgstatmonitor" + "github.com/percona/percona-postgresql-operator/v3/internal/pgstatstatements" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/pmm" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/registration" + "github.com/percona/percona-postgresql-operator/v3/internal/setuser" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( @@ -84,8 +84,8 @@ type Reconciler struct { } // +kubebuilder:rbac:groups="",resources="events",verbs={create,patch} -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={get,list,watch} -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters/status",verbs={patch} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={get,list,watch} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters/status",verbs={patch} // Reconcile reconciles a ConfigMap in a namespace managed by the PostgreSQL Operator func (r *Reconciler) Reconcile( @@ -518,7 +518,7 @@ func (r *Reconciler) patch( // creator of such a reference have either "delete" permission on the owner or // "update" permission on the owner's "finalizers" subresource. // - https://docs.k8s.io/reference/access-authn-authz/admission-controllers/ -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters/finalizers",verbs={update} // setControllerReference sets owner as a Controller OwnerReference on controlled. // Only one OwnerReference can be a controller, so it returns an error if another diff --git a/internal/controller/postgrescluster/controller_ref_manager.go b/internal/controller/postgrescluster/controller_ref_manager.go index e2a6a80e0b..11e336896c 100644 --- a/internal/controller/postgrescluster/controller_ref_manager.go +++ b/internal/controller/postgrescluster/controller_ref_manager.go @@ -17,10 +17,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/kubeapi" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/kubeapi" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // adoptObject adopts the provided Object by adding controller owner refs for the provided diff --git a/internal/controller/postgrescluster/controller_ref_manager_test.go b/internal/controller/postgrescluster/controller_ref_manager_test.go index 4781ff6bb5..0f907de5ed 100644 --- a/internal/controller/postgrescluster/controller_ref_manager_test.go +++ b/internal/controller/postgrescluster/controller_ref_manager_test.go @@ -13,8 +13,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) func TestManageControllerRefs(t *testing.T) { diff --git a/internal/controller/postgrescluster/controller_test.go b/internal/controller/postgrescluster/controller_test.go index 395ef4da6a..78e4495858 100644 --- a/internal/controller/postgrescluster/controller_test.go +++ b/internal/controller/postgrescluster/controller_test.go @@ -29,11 +29,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/registration" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/registration" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestDeleteControlled(t *testing.T) { diff --git a/internal/controller/postgrescluster/delete.go b/internal/controller/postgrescluster/delete.go index ff7deb3a40..f98dd69a55 100644 --- a/internal/controller/postgrescluster/delete.go +++ b/internal/controller/postgrescluster/delete.go @@ -12,11 +12,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={patch} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={patch} // handleDelete sets a finalizer on cluster and performs the finalization of // cluster when it is being deleted. It returns (nil, nil) when cluster is diff --git a/internal/controller/postgrescluster/helpers_test.go b/internal/controller/postgrescluster/helpers_test.go index af882bcc57..9e8555d376 100644 --- a/internal/controller/postgrescluster/helpers_test.go +++ b/internal/controller/postgrescluster/helpers_test.go @@ -20,11 +20,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var ( diff --git a/internal/controller/postgrescluster/instance.go b/internal/controller/postgrescluster/instance.go index f45be198a4..cb9fd84df7 100644 --- a/internal/controller/postgrescluster/instance.go +++ b/internal/controller/postgrescluster/instance.go @@ -27,20 +27,20 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "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/patroni" - "github.com/percona/percona-postgresql-operator/v2/internal/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/patroni" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // Instance represents a single PostgreSQL instance of a PostgresCluster. diff --git a/internal/controller/postgrescluster/instance_rollout_test.go b/internal/controller/postgrescluster/instance_rollout_test.go index 04d765baad..c604831023 100644 --- a/internal/controller/postgrescluster/instance_rollout_test.go +++ b/internal/controller/postgrescluster/instance_rollout_test.go @@ -23,9 +23,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestReconcilerRolloutInstance(t *testing.T) { diff --git a/internal/controller/postgrescluster/instance_test.go b/internal/controller/postgrescluster/instance_test.go index 868457a709..7897d5e382 100644 --- a/internal/controller/postgrescluster/instance_test.go +++ b/internal/controller/postgrescluster/instance_test.go @@ -34,13 +34,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "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/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestInstanceIsRunning(t *testing.T) { diff --git a/internal/controller/postgrescluster/patroni.go b/internal/controller/postgrescluster/patroni.go index 858b6cafd6..40d5b4c689 100644 --- a/internal/controller/postgrescluster/patroni.go +++ b/internal/controller/postgrescluster/patroni.go @@ -15,14 +15,14 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "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/patroni" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/patroni" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="",resources="endpoints",verbs={deletecollection} diff --git a/internal/controller/postgrescluster/patroni_test.go b/internal/controller/postgrescluster/patroni_test.go index 6ceb8069dc..aed6a1896a 100644 --- a/internal/controller/postgrescluster/patroni_test.go +++ b/internal/controller/postgrescluster/patroni_test.go @@ -24,10 +24,10 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePatroniLeaderLeaseService(t *testing.T) { @@ -64,7 +64,7 @@ labels: name: pg2-ha namespace: ns1 ownerReferences: -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/pgadmin.go b/internal/controller/postgrescluster/pgadmin.go index 4f1b527cd5..fb66d18574 100644 --- a/internal/controller/postgrescluster/pgadmin.go +++ b/internal/controller/postgrescluster/pgadmin.go @@ -18,13 +18,13 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/pgadmin" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgadmin" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // reconcilePGAdmin writes the objects necessary to run a pgAdmin Pod. diff --git a/internal/controller/postgrescluster/pgadmin_test.go b/internal/controller/postgrescluster/pgadmin_test.go index a2cdd07001..72b9fcd9ed 100644 --- a/internal/controller/postgrescluster/pgadmin_test.go +++ b/internal/controller/postgrescluster/pgadmin_test.go @@ -21,10 +21,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePGAdminConfigMap(t *testing.T) { @@ -83,7 +83,7 @@ labels: name: pg1-pgadmin namespace: some-ns ownerReferences: -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -178,7 +178,7 @@ labels: name: my-cluster-pgadmin namespace: my-ns ownerReferences: -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index 4a51d94709..cef7c4dc92 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -30,21 +30,21 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "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/patroni" - "github.com/percona/percona-postgresql-operator/v2/internal/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/patroni" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index e41a11e83e..fd2f8deaed 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -35,15 +35,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "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/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var testCronSchedule string = "*/15 * * * *" @@ -2097,7 +2097,7 @@ func TestReconcileCloudBasedDataSource(t *testing.T) { result: testResult{ configCount: 1, jobCount: 1, pvcCount: 1, expectedClusterCondition: nil, - conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", + conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", }, }, { desc: "global/configuration set", @@ -2114,7 +2114,7 @@ func TestReconcileCloudBasedDataSource(t *testing.T) { result: testResult{ configCount: 1, jobCount: 1, pvcCount: 1, expectedClusterCondition: nil, - conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = elephant\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", + conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = elephant\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", }, }, { desc: "invalid option: stanza", @@ -2129,7 +2129,7 @@ func TestReconcileCloudBasedDataSource(t *testing.T) { result: testResult{ configCount: 1, jobCount: 0, pvcCount: 1, expectedClusterCondition: nil, - conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", + conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", }, }, { desc: "cluster bootstrapped init condition missing", @@ -2148,7 +2148,7 @@ func TestReconcileCloudBasedDataSource(t *testing.T) { Reason: "ClusterAlreadyBootstrapped", Message: "The cluster is already bootstrapped", }, - conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", + conf: "|\n # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING.\n # If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true\n\n [global]\n archive-async = y\n log-path = /pgdata/pgbackrest/log\n repo1-path = /pgbackrest/repo1\n spool-path = /pgdata/pgbackrest-spool\n\n [db]\n pg1-path = /pgdata/pg13\n pg1-port = 5432\n pg1-socket-path = /tmp/postgres\n", }, }} diff --git a/internal/controller/postgrescluster/pgbouncer.go b/internal/controller/postgrescluster/pgbouncer.go index 1b63db2de7..7bb36e3fc7 100644 --- a/internal/controller/postgrescluster/pgbouncer.go +++ b/internal/controller/postgrescluster/pgbouncer.go @@ -19,14 +19,14 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "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/pgbouncer" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbouncer" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // reconcilePGBouncer writes the objects necessary to run a PgBouncer Pod. diff --git a/internal/controller/postgrescluster/pgbouncer_test.go b/internal/controller/postgrescluster/pgbouncer_test.go index aa07a75f8a..68c1887dad 100644 --- a/internal/controller/postgrescluster/pgbouncer_test.go +++ b/internal/controller/postgrescluster/pgbouncer_test.go @@ -19,10 +19,10 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePGBouncerService(t *testing.T) { @@ -83,7 +83,7 @@ labels: name: pg7-pgbouncer namespace: ns5 ownerReferences: -- apiVersion: upstream.pgv2.percona.com/v1beta1 +- apiVersion: upstream.pgv3.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/pgmonitor.go b/internal/controller/postgrescluster/pgmonitor.go index 158ff0f31d..3c9f00272e 100644 --- a/internal/controller/postgrescluster/pgmonitor.go +++ b/internal/controller/postgrescluster/pgmonitor.go @@ -15,16 +15,16 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/pgmonitor" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - pgpassword "github.com/percona/percona-postgresql-operator/v2/internal/postgres/password" - "github.com/percona/percona-postgresql-operator/v2/internal/util" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgmonitor" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + pgpassword "github.com/percona/percona-postgresql-operator/v3/internal/postgres/password" + "github.com/percona/percona-postgresql-operator/v3/internal/util" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // If pgMonitor is enabled the pgMonitor sidecar(s) have been added to the diff --git a/internal/controller/postgrescluster/pgmonitor_test.go b/internal/controller/postgrescluster/pgmonitor_test.go index 300926fbff..e1578823cf 100644 --- a/internal/controller/postgrescluster/pgmonitor_test.go +++ b/internal/controller/postgrescluster/pgmonitor_test.go @@ -20,12 +20,12 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func testExporterCollectorsAnnotation(t *testing.T, ctx context.Context, cluster *v1beta1.PostgresCluster, queriesConfig, webConfig *corev1.ConfigMap) { diff --git a/internal/controller/postgrescluster/pki.go b/internal/controller/postgrescluster/pki.go index 7ee3d61f7f..5b9e97f832 100644 --- a/internal/controller/postgrescluster/pki.go +++ b/internal/controller/postgrescluster/pki.go @@ -15,11 +15,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "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/pki" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/controller/postgrescluster/pki_test.go b/internal/controller/postgrescluster/pki_test.go index 2c61ad1d54..3c4619c122 100644 --- a/internal/controller/postgrescluster/pki_test.go +++ b/internal/controller/postgrescluster/pki_test.go @@ -22,11 +22,11 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // TestReconcileCerts tests the proper reconciliation of the root ca certificate @@ -102,7 +102,7 @@ func TestReconcileCerts(t *testing.T) { assert.Check(t, len(cluster1CASecret.ObjectMeta.OwnerReferences) == 1, "first owner reference not set") expectedOR := metav1.OwnerReference{ - APIVersion: "upstream.pgv2.percona.com/v1beta1", + APIVersion: "upstream.pgv3.percona.com/v1beta1", Kind: "PostgresCluster", Name: "hippocluster1", UID: cluster1.UID, @@ -130,7 +130,7 @@ func TestReconcileCerts(t *testing.T) { assert.Check(t, len(cluster2CASecret.ObjectMeta.OwnerReferences) == 1, "should be single owner reference") expectedOR := metav1.OwnerReference{ - APIVersion: "upstream.pgv2.percona.com/v1beta1", + APIVersion: "upstream.pgv3.percona.com/v1beta1", Kind: "PostgresCluster", Name: "hippocluster2", UID: cluster2.UID, diff --git a/internal/controller/postgrescluster/pod_disruption_budget.go b/internal/controller/postgrescluster/pod_disruption_budget.go index 508111cb62..649dac90d7 100644 --- a/internal/controller/postgrescluster/pod_disruption_budget.go +++ b/internal/controller/postgrescluster/pod_disruption_budget.go @@ -15,7 +15,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // generatePodDisruptionBudget takes parameters required to fill out a PDB and diff --git a/internal/controller/postgrescluster/pod_disruption_budget_test.go b/internal/controller/postgrescluster/pod_disruption_budget_test.go index 07bc5b8915..a3e36cc265 100644 --- a/internal/controller/postgrescluster/pod_disruption_budget_test.go +++ b/internal/controller/postgrescluster/pod_disruption_budget_test.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePodDisruptionBudget(t *testing.T) { diff --git a/internal/controller/postgrescluster/postgres.go b/internal/controller/postgrescluster/postgres.go index 8811c2f25f..32b481d83c 100644 --- a/internal/controller/postgrescluster/postgres.go +++ b/internal/controller/postgrescluster/postgres.go @@ -28,22 +28,22 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - "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/pgaudit" - "github.com/percona/percona-postgresql-operator/v2/internal/pgcron" - "github.com/percona/percona-postgresql-operator/v2/internal/pgrepack" - "github.com/percona/percona-postgresql-operator/v2/internal/pgstatmonitor" - "github.com/percona/percona-postgresql-operator/v2/internal/pgstatstatements" - "github.com/percona/percona-postgresql-operator/v2/internal/pgvector" - "github.com/percona/percona-postgresql-operator/v2/internal/postgis" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - pgpassword "github.com/percona/percona-postgresql-operator/v2/internal/postgres/password" - "github.com/percona/percona-postgresql-operator/v2/internal/setuser" - "github.com/percona/percona-postgresql-operator/v2/internal/util" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgaudit" + "github.com/percona/percona-postgresql-operator/v3/internal/pgcron" + "github.com/percona/percona-postgresql-operator/v3/internal/pgrepack" + "github.com/percona/percona-postgresql-operator/v3/internal/pgstatmonitor" + "github.com/percona/percona-postgresql-operator/v3/internal/pgstatstatements" + "github.com/percona/percona-postgresql-operator/v3/internal/pgvector" + "github.com/percona/percona-postgresql-operator/v3/internal/postgis" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + pgpassword "github.com/percona/percona-postgresql-operator/v3/internal/postgres/password" + "github.com/percona/percona-postgresql-operator/v3/internal/setuser" + "github.com/percona/percona-postgresql-operator/v3/internal/util" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // generatePostgresUserSecret returns a Secret containing a password and diff --git a/internal/controller/postgrescluster/postgres_test.go b/internal/controller/postgrescluster/postgres_test.go index d03d2733eb..f260327c41 100644 --- a/internal/controller/postgrescluster/postgres_test.go +++ b/internal/controller/postgrescluster/postgres_test.go @@ -23,15 +23,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePostgresUserSecret(t *testing.T) { diff --git a/internal/controller/postgrescluster/rbac.go b/internal/controller/postgrescluster/rbac.go index 73817e310e..db22234949 100644 --- a/internal/controller/postgrescluster/rbac.go +++ b/internal/controller/postgrescluster/rbac.go @@ -11,9 +11,9 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/patroni" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/patroni" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // reconcileRBACResources creates Roles, RoleBindings, and ServiceAccounts for diff --git a/internal/controller/postgrescluster/snapshots.go b/internal/controller/postgrescluster/snapshots.go index 9db6f381dc..e6e2965c42 100644 --- a/internal/controller/postgrescluster/snapshots.go +++ b/internal/controller/postgrescluster/snapshots.go @@ -18,14 +18,14 @@ import ( volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources="volumesnapshots",verbs={get,list,create,patch,delete} diff --git a/internal/controller/postgrescluster/snapshots_test.go b/internal/controller/postgrescluster/snapshots_test.go index 29d84adf03..5a48f1016b 100644 --- a/internal/controller/postgrescluster/snapshots_test.go +++ b/internal/controller/postgrescluster/snapshots_test.go @@ -21,13 +21,13 @@ import ( "k8s.io/client-go/discovery" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "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/events" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestReconcileVolumeSnapshots(t *testing.T) { diff --git a/internal/controller/postgrescluster/suite_test.go b/internal/controller/postgrescluster/suite_test.go index 1e0d828ee1..c9096b740d 100644 --- a/internal/controller/postgrescluster/suite_test.go +++ b/internal/controller/postgrescluster/suite_test.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) var suite struct { diff --git a/internal/controller/postgrescluster/topology_test.go b/internal/controller/postgrescluster/topology_test.go index da0933e2e5..80506d36d3 100644 --- a/internal/controller/postgrescluster/topology_test.go +++ b/internal/controller/postgrescluster/topology_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) func TestDefaultTopologySpreadConstraints(t *testing.T) { diff --git a/internal/controller/postgrescluster/util.go b/internal/controller/postgrescluster/util.go index 68c692a0f2..37a72b3cce 100644 --- a/internal/controller/postgrescluster/util.go +++ b/internal/controller/postgrescluster/util.go @@ -15,9 +15,9 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/rand" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var tmpDirSizeLimit = resource.MustParse("16Mi") diff --git a/internal/controller/postgrescluster/util_test.go b/internal/controller/postgrescluster/util_test.go index f73a4a49f0..6366460f7b 100644 --- a/internal/controller/postgrescluster/util_test.go +++ b/internal/controller/postgrescluster/util_test.go @@ -15,9 +15,9 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestSafeHash32(t *testing.T) { diff --git a/internal/controller/postgrescluster/volumes.go b/internal/controller/postgrescluster/volumes.go index 9e2221460c..318cb0a4fb 100644 --- a/internal/controller/postgrescluster/volumes.go +++ b/internal/controller/postgrescluster/volumes.go @@ -20,12 +20,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="",resources="persistentvolumeclaims",verbs={list} diff --git a/internal/controller/postgrescluster/volumes_test.go b/internal/controller/postgrescluster/volumes_test.go index 2c3abf6f9f..a7a68196c5 100644 --- a/internal/controller/postgrescluster/volumes_test.go +++ b/internal/controller/postgrescluster/volumes_test.go @@ -20,12 +20,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "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/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestHandlePersistentVolumeClaimError(t *testing.T) { diff --git a/internal/controller/postgrescluster/watches.go b/internal/controller/postgrescluster/watches.go index 2175bef865..54f8b5f208 100644 --- a/internal/controller/postgrescluster/watches.go +++ b/internal/controller/postgrescluster/watches.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/patroni" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/patroni" ) // watchCertManagerSecrets returns a handler.EventHandler for cert-manager-issued diff --git a/internal/controller/runtime/conversion_test.go b/internal/controller/runtime/conversion_test.go index 1e167645e1..cf8c922215 100644 --- a/internal/controller/runtime/conversion_test.go +++ b/internal/controller/runtime/conversion_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" ) func TestConvertUnstructured(t *testing.T) { diff --git a/internal/controller/runtime/runtime.go b/internal/controller/runtime/runtime.go index 7ae99851ca..5175806702 100644 --- a/internal/controller/runtime/runtime.go +++ b/internal/controller/runtime/runtime.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type ( diff --git a/internal/controller/standalone_pgadmin/configmap.go b/internal/controller/standalone_pgadmin/configmap.go index ff07a7c203..9410fd6692 100644 --- a/internal/controller/standalone_pgadmin/configmap.go +++ b/internal/controller/standalone_pgadmin/configmap.go @@ -17,9 +17,9 @@ import ( "github.com/pkg/errors" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="",resources="configmaps",verbs={get} diff --git a/internal/controller/standalone_pgadmin/configmap_test.go b/internal/controller/standalone_pgadmin/configmap_test.go index 2e2a6a8288..92d97865f4 100644 --- a/internal/controller/standalone_pgadmin/configmap_test.go +++ b/internal/controller/standalone_pgadmin/configmap_test.go @@ -9,9 +9,9 @@ import ( "gotest.tools/v3/assert" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGenerateConfig(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/controller.go b/internal/controller/standalone_pgadmin/controller.go index cb7454f6e1..aee0b6319e 100644 --- a/internal/controller/standalone_pgadmin/controller.go +++ b/internal/controller/standalone_pgadmin/controller.go @@ -17,9 +17,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - controllerruntime "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + controllerruntime "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // PGAdminReconciler reconciles a PGAdmin object @@ -34,7 +34,7 @@ type PGAdminReconciler struct { IsOpenShift bool } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={list,watch} //+kubebuilder:rbac:groups="",resources="persistentvolumeclaims",verbs={list,watch} //+kubebuilder:rbac:groups="",resources="secrets",verbs={list,watch} //+kubebuilder:rbac:groups="",resources="configmaps",verbs={list,watch} @@ -70,8 +70,8 @@ func (r *PGAdminReconciler) SetupWithManager(mgr ctrl.Manager) error { Complete(r) } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgadmins",verbs={get} -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgadmins/status",verbs={patch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins",verbs={get} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins/status",verbs={patch} // Reconcile which aims to move the current state of the pgAdmin closer to the // desired state described in a [v1beta1.PGAdmin] identified by request. @@ -148,7 +148,7 @@ func (r *PGAdminReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct // creator of such a reference have either "delete" permission on the owner or // "update" permission on the owner's "finalizers" subresource. // - https://docs.k8s.io/reference/access-authn-authz/admission-controllers/ -// +kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgadmins/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins/finalizers",verbs={update} // setControllerReference sets owner as a Controller OwnerReference on controlled. // Only one OwnerReference can be a controller, so it returns an error if another diff --git a/internal/controller/standalone_pgadmin/controller_test.go b/internal/controller/standalone_pgadmin/controller_test.go index 6f6eed14c3..e52f751444 100644 --- a/internal/controller/standalone_pgadmin/controller_test.go +++ b/internal/controller/standalone_pgadmin/controller_test.go @@ -14,8 +14,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestDeleteControlled(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/helpers_test.go b/internal/controller/standalone_pgadmin/helpers_test.go index a4d9201639..5ccb71a549 100644 --- a/internal/controller/standalone_pgadmin/helpers_test.go +++ b/internal/controller/standalone_pgadmin/helpers_test.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) // Scale extends d according to PGO_TEST_TIMEOUT_SCALE. diff --git a/internal/controller/standalone_pgadmin/helpers_unit_test.go b/internal/controller/standalone_pgadmin/helpers_unit_test.go index cb210f27d6..fc01cb0c7a 100644 --- a/internal/controller/standalone_pgadmin/helpers_unit_test.go +++ b/internal/controller/standalone_pgadmin/helpers_unit_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // TODO(benjaminjb): This file is duplicated test help functions diff --git a/internal/controller/standalone_pgadmin/pod.go b/internal/controller/standalone_pgadmin/pod.go index 582d72dc79..54a36fd7c7 100644 --- a/internal/controller/standalone_pgadmin/pod.go +++ b/internal/controller/standalone_pgadmin/pod.go @@ -12,10 +12,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/controller/standalone_pgadmin/pod_test.go b/internal/controller/standalone_pgadmin/pod_test.go index 87f1f892ea..652109c0e4 100644 --- a/internal/controller/standalone_pgadmin/pod_test.go +++ b/internal/controller/standalone_pgadmin/pod_test.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPod(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/postgrescluster.go b/internal/controller/standalone_pgadmin/postgrescluster.go index 0c01935b77..b4b363b1b9 100644 --- a/internal/controller/standalone_pgadmin/postgrescluster.go +++ b/internal/controller/standalone_pgadmin/postgrescluster.go @@ -11,11 +11,11 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgadmins",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins",verbs={list} // findPGAdminsForPostgresCluster returns PGAdmins that target a given cluster. func (r *PGAdminReconciler) findPGAdminsForPostgresCluster( @@ -50,7 +50,7 @@ func (r *PGAdminReconciler) findPGAdminsForPostgresCluster( return matching } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="postgresclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={list,watch} // getClustersForPGAdmin returns clusters managed by the given pgAdmin func (r *PGAdminReconciler) getClustersForPGAdmin( diff --git a/internal/controller/standalone_pgadmin/service.go b/internal/controller/standalone_pgadmin/service.go index e3588514c2..16a7f30b17 100644 --- a/internal/controller/standalone_pgadmin/service.go +++ b/internal/controller/standalone_pgadmin/service.go @@ -17,9 +17,9 @@ import ( "github.com/pkg/errors" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="",resources="services",verbs={get} diff --git a/internal/controller/standalone_pgadmin/service_test.go b/internal/controller/standalone_pgadmin/service_test.go index 2e0d0b0fdf..fbf7047cb2 100644 --- a/internal/controller/standalone_pgadmin/service_test.go +++ b/internal/controller/standalone_pgadmin/service_test.go @@ -9,8 +9,8 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestService(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/statefulset.go b/internal/controller/standalone_pgadmin/statefulset.go index 6ace91818a..78bfb16f5a 100644 --- a/internal/controller/standalone_pgadmin/statefulset.go +++ b/internal/controller/standalone_pgadmin/statefulset.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // reconcilePGAdminStatefulSet writes the StatefulSet that runs pgAdmin. diff --git a/internal/controller/standalone_pgadmin/statefulset_test.go b/internal/controller/standalone_pgadmin/statefulset_test.go index cad9bb5f76..229da1bda3 100644 --- a/internal/controller/standalone_pgadmin/statefulset_test.go +++ b/internal/controller/standalone_pgadmin/statefulset_test.go @@ -14,10 +14,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestReconcilePGAdminStatefulSet(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/users.go b/internal/controller/standalone_pgadmin/users.go index 9e6582467e..8bb0e75f21 100644 --- a/internal/controller/standalone_pgadmin/users.go +++ b/internal/controller/standalone_pgadmin/users.go @@ -18,9 +18,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type Executor func( diff --git a/internal/controller/standalone_pgadmin/users_test.go b/internal/controller/standalone_pgadmin/users_test.go index 215523ed97..9d8ef99efa 100644 --- a/internal/controller/standalone_pgadmin/users_test.go +++ b/internal/controller/standalone_pgadmin/users_test.go @@ -19,11 +19,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "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/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestReconcilePGAdminUsers(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/volume.go b/internal/controller/standalone_pgadmin/volume.go index cb92fdd66d..6709eb3257 100644 --- a/internal/controller/standalone_pgadmin/volume.go +++ b/internal/controller/standalone_pgadmin/volume.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:groups="",resources="persistentvolumeclaims",verbs={create,patch} diff --git a/internal/controller/standalone_pgadmin/volume_test.go b/internal/controller/standalone_pgadmin/volume_test.go index f287850f83..60d69f914d 100644 --- a/internal/controller/standalone_pgadmin/volume_test.go +++ b/internal/controller/standalone_pgadmin/volume_test.go @@ -17,12 +17,12 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - "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/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestReconcilePGAdminDataVolume(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/watches.go b/internal/controller/standalone_pgadmin/watches.go index 779f5cfa49..d8de059b2f 100644 --- a/internal/controller/standalone_pgadmin/watches.go +++ b/internal/controller/standalone_pgadmin/watches.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // watchPostgresClusters returns a [handler.EventHandler] for PostgresClusters. @@ -73,7 +73,7 @@ func (r *PGAdminReconciler) watchForRelatedSecret() handler.EventHandler { } } -//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgadmins",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins",verbs={list} // findPGAdminsForSecret returns PGAdmins that have a user or users that have their password // stored in the Secret diff --git a/internal/controller/standalone_pgadmin/watches_test.go b/internal/controller/standalone_pgadmin/watches_test.go index ae20162470..0a962ee7f3 100644 --- a/internal/controller/standalone_pgadmin/watches_test.go +++ b/internal/controller/standalone_pgadmin/watches_test.go @@ -12,8 +12,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestFindPGAdminsForSecret(t *testing.T) { diff --git a/internal/initialize/intstr_test.go b/internal/initialize/intstr_test.go index 25bea92895..93b5cbc7c1 100644 --- a/internal/initialize/intstr_test.go +++ b/internal/initialize/intstr_test.go @@ -21,7 +21,7 @@ import ( "gotest.tools/v3/assert" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" ) func TestIntOrStringInt32(t *testing.T) { diff --git a/internal/initialize/metadata_test.go b/internal/initialize/metadata_test.go index 1ad4016d10..50b4d463c0 100644 --- a/internal/initialize/metadata_test.go +++ b/internal/initialize/metadata_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" ) func TestAnnotations(t *testing.T) { diff --git a/internal/initialize/primitives_test.go b/internal/initialize/primitives_test.go index cf942c1a5b..0a480de96c 100644 --- a/internal/initialize/primitives_test.go +++ b/internal/initialize/primitives_test.go @@ -9,7 +9,7 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" ) func TestFromPointer(t *testing.T) { diff --git a/internal/initialize/security_test.go b/internal/initialize/security_test.go index 8a684e3ada..e8c2dcef39 100644 --- a/internal/initialize/security_test.go +++ b/internal/initialize/security_test.go @@ -11,7 +11,7 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" ) func TestPodSecurityContext(t *testing.T) { diff --git a/internal/naming/labels.go b/internal/naming/labels.go index ad67a6bc9c..5b95870fc9 100644 --- a/internal/naming/labels.go +++ b/internal/naming/labels.go @@ -11,7 +11,7 @@ import ( const ( labelPrefix = "postgres-operator.crunchydata.com/" - perconaLabelPrefix = "pgv2.percona.com/" + perconaLabelPrefix = "pgv3.percona.com/" appK8sPrefix = "app.kubernetes.io/" LabelVersion = perconaLabelPrefix + "version" diff --git a/internal/naming/names.go b/internal/naming/names.go index cca81200ef..b8a698d13a 100644 --- a/internal/naming/names.go +++ b/internal/naming/names.go @@ -13,8 +13,8 @@ import ( "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/naming/names_test.go b/internal/naming/names_test.go index 86d3d736be..746aed2db9 100644 --- a/internal/naming/names_test.go +++ b/internal/naming/names_test.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestAsObjectKey(t *testing.T) { diff --git a/internal/naming/selectors.go b/internal/naming/selectors.go index 5c11b0ee62..334fcc7f92 100644 --- a/internal/naming/selectors.go +++ b/internal/naming/selectors.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // AsSelector is a wrapper around metav1.LabelSelectorAsSelector() which converts diff --git a/internal/naming/selectors_test.go b/internal/naming/selectors_test.go index ebec6ef487..8757d48108 100644 --- a/internal/naming/selectors_test.go +++ b/internal/naming/selectors_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestAnyCluster(t *testing.T) { diff --git a/internal/naming/telemetry.go b/internal/naming/telemetry.go index 82bf0dcee3..212205ed0b 100644 --- a/internal/naming/telemetry.go +++ b/internal/naming/telemetry.go @@ -6,4 +6,4 @@ package naming import "go.opentelemetry.io/otel" -var tracer = otel.Tracer("github.com/percona/percona-postgresql-operator/v2/naming") +var tracer = otel.Tracer("github.com/percona/percona-postgresql-operator/v3/naming") diff --git a/internal/patroni/api.go b/internal/patroni/api.go index 5f047267cd..1f8f0a1542 100644 --- a/internal/patroni/api.go +++ b/internal/patroni/api.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" ) // API defines a general interface for interacting with the Patroni API. diff --git a/internal/patroni/certificates_test.go b/internal/patroni/certificates_test.go index 534f977672..b0f9a2ff5f 100644 --- a/internal/patroni/certificates_test.go +++ b/internal/patroni/certificates_test.go @@ -11,7 +11,7 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) type funcMarshaler func() ([]byte, error) diff --git a/internal/patroni/config.go b/internal/patroni/config.go index 64752d08d0..44d0c61cdd 100644 --- a/internal/patroni/config.go +++ b/internal/patroni/config.go @@ -14,10 +14,10 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/patroni/config_test.go b/internal/patroni/config_test.go index 8598ca58f6..dd8dd58de3 100644 --- a/internal/patroni/config_test.go +++ b/internal/patroni/config_test.go @@ -18,13 +18,13 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestClusterYAML(t *testing.T) { @@ -41,7 +41,7 @@ func TestClusterYAML(t *testing.T) { assert.NilError(t, err) assert.Equal(t, data, strings.TrimSpace(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true bootstrap: dcs: loop_wait: 10 @@ -206,7 +206,7 @@ watchdog: assert.NilError(t, err) assert.Equal(t, data, strings.TrimSpace(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true bootstrap: dcs: loop_wait: 10 @@ -1142,7 +1142,7 @@ func TestInstanceYAML(t *testing.T) { assert.NilError(t, err) assert.Equal(t, data, strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true bootstrap: initdb: - data-checksums @@ -1165,7 +1165,7 @@ tags: {} assert.NilError(t, err) assert.Equal(t, dataWithReplicaCreate, strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true bootstrap: initdb: - data-checksums @@ -1205,7 +1205,7 @@ tags: {} assert.NilError(t, err) assert.Equal(t, datawithTDE, strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true bootstrap: initdb: - data-checksums @@ -1230,7 +1230,7 @@ tags: {} assert.NilError(t, err) assert.Equal(t, dataWithCustomMethods, strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true bootstrap: initdb: - data-checksums diff --git a/internal/patroni/rbac.go b/internal/patroni/rbac.go index 2e19339ed9..9918a230bb 100644 --- a/internal/patroni/rbac.go +++ b/internal/patroni/rbac.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // "list", "patch", and "watch" are required. Include "get" for good measure. diff --git a/internal/patroni/rbac_test.go b/internal/patroni/rbac_test.go index 4b45aa1f94..7c300281ac 100644 --- a/internal/patroni/rbac_test.go +++ b/internal/patroni/rbac_test.go @@ -10,8 +10,8 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func isUniqueAndSorted(slice []string) bool { diff --git a/internal/patroni/reconcile.go b/internal/patroni/reconcile.go index ece6cea757..4ee7d2f35f 100644 --- a/internal/patroni/reconcile.go +++ b/internal/patroni/reconcile.go @@ -12,14 +12,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "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/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // ClusterBootstrapped returns a bool indicating whether or not Patroni has successfully diff --git a/internal/patroni/reconcile_test.go b/internal/patroni/reconcile_test.go index afc22b8530..593572dbd7 100644 --- a/internal/patroni/reconcile_test.go +++ b/internal/patroni/reconcile_test.go @@ -12,11 +12,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestClusterConfigMap(t *testing.T) { @@ -228,12 +228,12 @@ volumes: name: crunchy-bin `, labels: map[string]string{ - "pgv2.percona.com/version": "2.7.0", + "pgv3.percona.com/version": "2.7.0", }, }, "version <2.7.0 specified": { labels: map[string]string{ - "pgv2.percona.com/version": "2.6.0", + "pgv3.percona.com/version": "2.6.0", }, expectedSpec: ` containers: diff --git a/internal/pgadmin/config.go b/internal/pgadmin/config.go index d30b32c2ef..8b851a610b 100644 --- a/internal/pgadmin/config.go +++ b/internal/pgadmin/config.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/pgadmin/config_test.go b/internal/pgadmin/config_test.go index f47cd1a024..0b96af6721 100644 --- a/internal/pgadmin/config_test.go +++ b/internal/pgadmin/config_test.go @@ -14,9 +14,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPodConfigFiles(t *testing.T) { diff --git a/internal/pgadmin/reconcile.go b/internal/pgadmin/reconcile.go index a68725ada0..0817a16d19 100644 --- a/internal/pgadmin/reconcile.go +++ b/internal/pgadmin/reconcile.go @@ -12,10 +12,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // startupScript is the script for the configuration and startup of the pgAdmin service. diff --git a/internal/pgadmin/reconcile_test.go b/internal/pgadmin/reconcile_test.go index bfaee6d20b..b2b1550fb7 100644 --- a/internal/pgadmin/reconcile_test.go +++ b/internal/pgadmin/reconcile_test.go @@ -12,9 +12,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestConfigMap(t *testing.T) { diff --git a/internal/pgadmin/users.go b/internal/pgadmin/users.go index dc95c1a29c..3a5eeab796 100644 --- a/internal/pgadmin/users.go +++ b/internal/pgadmin/users.go @@ -12,9 +12,9 @@ import ( "io" "strings" - "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/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type Executor func( diff --git a/internal/pgadmin/users_test.go b/internal/pgadmin/users_test.go index dba8afd2fd..9ba088b6fb 100644 --- a/internal/pgadmin/users_test.go +++ b/internal/pgadmin/users_test.go @@ -17,8 +17,8 @@ import ( "gotest.tools/v3/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestWriteUsersInPGAdmin(t *testing.T) { diff --git a/internal/pgaudit/postgres.go b/internal/pgaudit/postgres.go index b4c5df8313..f4fff4d3aa 100644 --- a/internal/pgaudit/postgres.go +++ b/internal/pgaudit/postgres.go @@ -7,8 +7,8 @@ package pgaudit import ( "context" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) // When the pgAudit shared library is not loaded, the extension cannot be diff --git a/internal/pgaudit/postgres_test.go b/internal/pgaudit/postgres_test.go index d160e8034f..ee039ee525 100644 --- a/internal/pgaudit/postgres_test.go +++ b/internal/pgaudit/postgres_test.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func TestEnableInPostgreSQL(t *testing.T) { diff --git a/internal/pgbackrest/certificates_test.go b/internal/pgbackrest/certificates_test.go index 767d3048ca..cbd992dcdc 100644 --- a/internal/pgbackrest/certificates_test.go +++ b/internal/pgbackrest/certificates_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) type funcMarshaler func() ([]byte, error) diff --git a/internal/pgbackrest/config.go b/internal/pgbackrest/config.go index 0ed478dbd3..3ba3c4def7 100644 --- a/internal/pgbackrest/config.go +++ b/internal/pgbackrest/config.go @@ -14,11 +14,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/pgbackrest/config_test.go b/internal/pgbackrest/config_test.go index c931558e21..c058c7c680 100644 --- a/internal/pgbackrest/config_test.go +++ b/internal/pgbackrest/config_test.go @@ -16,10 +16,10 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestCreatePGBackRestConfigMapIntent(t *testing.T) { @@ -88,7 +88,7 @@ func TestCreatePGBackRestConfigMapIntent(t *testing.T) { assert.Equal(t, configmap.Data["config-hash"], "abcde12345") assert.Equal(t, configmap.Data["pgbackrest_repo.conf"], strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true [global] log-path = /pgbackrest/repo1/log @@ -119,7 +119,7 @@ pg1-socket-path = /tmp/postgres assert.Equal(t, configmap.Data["pgbackrest_instance.conf"], strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true [global] archive-async = y diff --git a/internal/pgbackrest/pgbackrest.go b/internal/pgbackrest/pgbackrest.go index 95a8cc8cc5..a4bf92fcc3 100644 --- a/internal/pgbackrest/pgbackrest.go +++ b/internal/pgbackrest/pgbackrest.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/pgbackrest/pgbackrest_test.go b/internal/pgbackrest/pgbackrest_test.go index d51f2d4675..12bc8facc4 100644 --- a/internal/pgbackrest/pgbackrest_test.go +++ b/internal/pgbackrest/pgbackrest_test.go @@ -16,8 +16,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestStanzaCreateOrUpgrade(t *testing.T) { diff --git a/internal/pgbackrest/postgres.go b/internal/pgbackrest/postgres.go index a451ab557f..2f2b736187 100644 --- a/internal/pgbackrest/postgres.go +++ b/internal/pgbackrest/postgres.go @@ -7,8 +7,8 @@ package pgbackrest import ( "strings" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // PostgreSQL populates outParameters with any settings needed to run pgBackRest. diff --git a/internal/pgbackrest/postgres_test.go b/internal/pgbackrest/postgres_test.go index 7de00d1c49..45c1c0987b 100644 --- a/internal/pgbackrest/postgres_test.go +++ b/internal/pgbackrest/postgres_test.go @@ -10,9 +10,9 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPostgreSQLParameters(t *testing.T) { @@ -23,7 +23,7 @@ func TestPostgreSQLParameters(t *testing.T) { if cluster.Labels == nil { cluster.Labels = make(map[string]string) } - cluster.Labels["pgv2.percona.com/version"] = version.Version() + cluster.Labels["pgv3.percona.com/version"] = version.Version() PostgreSQL(cluster, parameters, true) assert.DeepEqual(t, parameters.Mandatory.AsMap(), map[string]string{ @@ -97,7 +97,7 @@ func TestPostgreSQLParameters(t *testing.T) { if cluster.Labels == nil { cluster.Labels = make(map[string]string) } - cluster.Labels["pgv2.percona.com/version"] = "2.7.0" + cluster.Labels["pgv3.percona.com/version"] = "2.7.0" PostgreSQL(cluster, parameters, true) assert.DeepEqual(t, parameters.Mandatory.AsMap(), map[string]string{ diff --git a/internal/pgbackrest/rbac.go b/internal/pgbackrest/rbac.go index 3e0cedd909..08f5a8c902 100644 --- a/internal/pgbackrest/rbac.go +++ b/internal/pgbackrest/rbac.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // +kubebuilder:rbac:namespace=pgbackrest,groups="",resources="pods",verbs={list} diff --git a/internal/pgbackrest/rbac_test.go b/internal/pgbackrest/rbac_test.go index f4ff876cc0..fcfb051d25 100644 --- a/internal/pgbackrest/rbac_test.go +++ b/internal/pgbackrest/rbac_test.go @@ -10,8 +10,8 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func isUniqueAndSorted(slice []string) bool { diff --git a/internal/pgbackrest/reconcile.go b/internal/pgbackrest/reconcile.go index f65b45814a..504f898df9 100644 --- a/internal/pgbackrest/reconcile.go +++ b/internal/pgbackrest/reconcile.go @@ -12,13 +12,13 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // AddRepoVolumesToPod adds pgBackRest repository volumes to the provided Pod template spec, while diff --git a/internal/pgbackrest/reconcile_test.go b/internal/pgbackrest/reconcile_test.go index 98a3dfbb98..cb7f87d5f2 100644 --- a/internal/pgbackrest/reconcile_test.go +++ b/internal/pgbackrest/reconcile_test.go @@ -17,11 +17,11 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestAddRepoVolumesToPod(t *testing.T) { diff --git a/internal/pgbackrest/util.go b/internal/pgbackrest/util.go index 5059710b39..e3aeae9831 100644 --- a/internal/pgbackrest/util.go +++ b/internal/pgbackrest/util.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/rand" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // maxPGBackrestRepos is the maximum number of repositories that can be configured according to the diff --git a/internal/pgbackrest/util_test.go b/internal/pgbackrest/util_test.go index 1eb6416bdf..134754e26f 100644 --- a/internal/pgbackrest/util_test.go +++ b/internal/pgbackrest/util_test.go @@ -13,7 +13,7 @@ import ( "gotest.tools/v3/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestCalculateConfigHashes(t *testing.T) { diff --git a/internal/pgbouncer/certificates_test.go b/internal/pgbouncer/certificates_test.go index 94757456c7..88dee04c22 100644 --- a/internal/pgbouncer/certificates_test.go +++ b/internal/pgbouncer/certificates_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) func TestBackendAuthority(t *testing.T) { diff --git a/internal/pgbouncer/config.go b/internal/pgbouncer/config.go index eec9ca7355..4c93a16a7a 100644 --- a/internal/pgbouncer/config.go +++ b/internal/pgbouncer/config.go @@ -12,9 +12,9 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/pgbouncer/config_test.go b/internal/pgbouncer/config_test.go index 887cb52178..641f1b5083 100644 --- a/internal/pgbouncer/config_test.go +++ b/internal/pgbouncer/config_test.go @@ -18,9 +18,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/yaml" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPrettyYAML(t *testing.T) { @@ -59,7 +59,7 @@ func TestClusterINI(t *testing.T) { t.Run("Default", func(t *testing.T) { assert.Equal(t, clusterINI(cluster), strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true [pgbouncer] %include /etc/pgbouncer/pgbouncer.ini @@ -99,7 +99,7 @@ unix_socket_dir = assert.Equal(t, clusterINI(cluster), strings.Trim(` # Generated by postgres-operator. DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING. -# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv3.percona.com/override-config=true [pgbouncer] %include /etc/pgbouncer/pgbouncer.ini diff --git a/internal/pgbouncer/postgres.go b/internal/pgbouncer/postgres.go index 9aa27475ff..04913848ee 100644 --- a/internal/pgbouncer/postgres.go +++ b/internal/pgbouncer/postgres.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres/password" - "github.com/percona/percona-postgresql-operator/v2/internal/util" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres/password" + "github.com/percona/percona-postgresql-operator/v3/internal/util" ) const ( diff --git a/internal/pgbouncer/reconcile.go b/internal/pgbouncer/reconcile.go index 244d0e85df..ff5cd291af 100644 --- a/internal/pgbouncer/reconcile.go +++ b/internal/pgbouncer/reconcile.go @@ -11,13 +11,13 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // ConfigMap populates the PgBouncer ConfigMap. diff --git a/internal/pgbouncer/reconcile_test.go b/internal/pgbouncer/reconcile_test.go index 53fc103254..2e855e192e 100644 --- a/internal/pgbouncer/reconcile_test.go +++ b/internal/pgbouncer/reconcile_test.go @@ -14,12 +14,12 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/internal/pki" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/pki" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestConfigMap(t *testing.T) { diff --git a/internal/pgcron/postgres.go b/internal/pgcron/postgres.go index 6c39593ac6..3717de0dea 100644 --- a/internal/pgcron/postgres.go +++ b/internal/pgcron/postgres.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) // EnableInPostgreSQL installs pg_cron in the postgres database. diff --git a/internal/pgcron/postgres_test.go b/internal/pgcron/postgres_test.go index 73cf202dad..5515934d01 100644 --- a/internal/pgcron/postgres_test.go +++ b/internal/pgcron/postgres_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func TestEnableInPostgreSQL(t *testing.T) { diff --git a/internal/pgmonitor/api.go b/internal/pgmonitor/api.go index 2037b5f8c7..b377455142 100644 --- a/internal/pgmonitor/api.go +++ b/internal/pgmonitor/api.go @@ -22,7 +22,7 @@ import ( "io" "strings" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" ) type Executor func( diff --git a/internal/pgmonitor/exporter.go b/internal/pgmonitor/exporter.go index b6a4f35637..11754f2c8f 100644 --- a/internal/pgmonitor/exporter.go +++ b/internal/pgmonitor/exporter.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/pgmonitor/exporter_test.go b/internal/pgmonitor/exporter_test.go index c88f265352..16d1220714 100644 --- a/internal/pgmonitor/exporter_test.go +++ b/internal/pgmonitor/exporter_test.go @@ -13,8 +13,8 @@ import ( "gotest.tools/v3/assert" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGenerateDefaultExporterQueries(t *testing.T) { diff --git a/internal/pgmonitor/postgres.go b/internal/pgmonitor/postgres.go index 545377512d..957568703b 100644 --- a/internal/pgmonitor/postgres.go +++ b/internal/pgmonitor/postgres.go @@ -9,9 +9,9 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/pgmonitor/postgres_test.go b/internal/pgmonitor/postgres_test.go index 5d5721567e..7172538eb3 100644 --- a/internal/pgmonitor/postgres_test.go +++ b/internal/pgmonitor/postgres_test.go @@ -10,8 +10,8 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPostgreSQLHBA(t *testing.T) { diff --git a/internal/pgmonitor/util.go b/internal/pgmonitor/util.go index 90ed3837ad..cf93fed179 100644 --- a/internal/pgmonitor/util.go +++ b/internal/pgmonitor/util.go @@ -8,8 +8,8 @@ import ( "context" "os" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func GetQueriesConfigDir(ctx context.Context) string { diff --git a/internal/pgmonitor/util_test.go b/internal/pgmonitor/util_test.go index 23bb87dedd..401b500875 100644 --- a/internal/pgmonitor/util_test.go +++ b/internal/pgmonitor/util_test.go @@ -9,7 +9,7 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestExporterEnabled(t *testing.T) { diff --git a/internal/pgrepack/postgres.go b/internal/pgrepack/postgres.go index 401ca692ce..1762956969 100644 --- a/internal/pgrepack/postgres.go +++ b/internal/pgrepack/postgres.go @@ -3,8 +3,8 @@ package pgrepack import ( "context" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) // EnableInPostgreSQL installs pg_repack triggers into every database. diff --git a/internal/pgstatmonitor/pgstatmonitor.go b/internal/pgstatmonitor/pgstatmonitor.go index 1869cb0d80..af3c60cb8a 100644 --- a/internal/pgstatmonitor/pgstatmonitor.go +++ b/internal/pgstatmonitor/pgstatmonitor.go @@ -3,8 +3,8 @@ package pgstatmonitor import ( "context" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func EnableInPostgreSQL(ctx context.Context, exec postgres.Executor) error { diff --git a/internal/pgstatmonitor/pgstatmonitor_test.go b/internal/pgstatmonitor/pgstatmonitor_test.go index d913d91127..0c8295a25a 100644 --- a/internal/pgstatmonitor/pgstatmonitor_test.go +++ b/internal/pgstatmonitor/pgstatmonitor_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func TestEnableInPostgreSQL(t *testing.T) { diff --git a/internal/pgstatstatements/pgstatstatement.go b/internal/pgstatstatements/pgstatstatement.go index 0f033d3d3e..cb0cdc6e14 100644 --- a/internal/pgstatstatements/pgstatstatement.go +++ b/internal/pgstatstatements/pgstatstatement.go @@ -3,8 +3,8 @@ package pgstatstatements import ( "context" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func EnableInPostgreSQL(ctx context.Context, exec postgres.Executor) error { diff --git a/internal/pgstatstatements/pgstatstatement_test.go b/internal/pgstatstatements/pgstatstatement_test.go index bbe1a066e9..4003476c8c 100644 --- a/internal/pgstatstatements/pgstatstatement_test.go +++ b/internal/pgstatstatements/pgstatstatement_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func TestEnableInPostgreSQL(t *testing.T) { diff --git a/internal/pgvector/postgres.go b/internal/pgvector/postgres.go index ba3122a03e..8689b74852 100644 --- a/internal/pgvector/postgres.go +++ b/internal/pgvector/postgres.go @@ -3,8 +3,8 @@ package pgvector import ( "context" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) // EnableInPostgreSQL installs pgvector triggers into every database. diff --git a/internal/pki/encoding_test.go b/internal/pki/encoding_test.go index 837e4f38e7..52af916aa8 100644 --- a/internal/pki/encoding_test.go +++ b/internal/pki/encoding_test.go @@ -14,7 +14,7 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) func TestCertificateTextMarshaling(t *testing.T) { diff --git a/internal/pki/pki_test.go b/internal/pki/pki_test.go index 2eb5633961..27cf0c35ad 100644 --- a/internal/pki/pki_test.go +++ b/internal/pki/pki_test.go @@ -16,7 +16,7 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) type StringSet map[string]struct{} diff --git a/internal/pmm/hba.go b/internal/pmm/hba.go index 4846757e6d..5c659510e3 100644 --- a/internal/pmm/hba.go +++ b/internal/pmm/hba.go @@ -1,8 +1,8 @@ package pmm import ( - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/postgis/postgis.go b/internal/postgis/postgis.go index 7b54a06395..85064abd9b 100644 --- a/internal/postgis/postgis.go +++ b/internal/postgis/postgis.go @@ -8,8 +8,8 @@ import ( "context" "strings" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) // EnableInPostgreSQL installs triggers for the following extensions into every database: diff --git a/internal/postgres/config.go b/internal/postgres/config.go index 807842d9de..e7bfbe75df 100644 --- a/internal/postgres/config.go +++ b/internal/postgres/config.go @@ -11,10 +11,10 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/postgres/config_test.go b/internal/postgres/config_test.go index 946e956694..993057932f 100644 --- a/internal/postgres/config_test.go +++ b/internal/postgres/config_test.go @@ -19,9 +19,9 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestConfigDirectory(t *testing.T) { diff --git a/internal/postgres/databases.go b/internal/postgres/databases.go index 0129ce7ab6..7fd309c1ce 100644 --- a/internal/postgres/databases.go +++ b/internal/postgres/databases.go @@ -9,7 +9,7 @@ import ( "context" "encoding/json" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" ) // CreateDatabasesInPostgreSQL calls exec to create databases that do not exist diff --git a/internal/postgres/databases_test.go b/internal/postgres/databases_test.go index 9e4f3b11ac..24aa9cb1ee 100644 --- a/internal/postgres/databases_test.go +++ b/internal/postgres/databases_test.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) func TestCreateDatabasesInPostgreSQL(t *testing.T) { diff --git a/internal/postgres/exec_test.go b/internal/postgres/exec_test.go index 4bc31a6fcc..d6be8a0384 100644 --- a/internal/postgres/exec_test.go +++ b/internal/postgres/exec_test.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" ) // This example demonstrates how Executor can work with exec.Cmd. diff --git a/internal/postgres/hba_test.go b/internal/postgres/hba_test.go index 5e2900c853..1f1988c8ec 100644 --- a/internal/postgres/hba_test.go +++ b/internal/postgres/hba_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) func TestNewHBAs(t *testing.T) { diff --git a/internal/postgres/huge_pages.go b/internal/postgres/huge_pages.go index 003fa4beee..7883267fc1 100644 --- a/internal/postgres/huge_pages.go +++ b/internal/postgres/huge_pages.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // This function looks for a valid huge_pages resource request. If it finds one, diff --git a/internal/postgres/huge_pages_test.go b/internal/postgres/huge_pages_test.go index 73b3d635c3..ac43be88e8 100644 --- a/internal/postgres/huge_pages_test.go +++ b/internal/postgres/huge_pages_test.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestSetHugePages(t *testing.T) { diff --git a/internal/postgres/reconcile.go b/internal/postgres/reconcile.go index 052e55af06..fd34c98cb0 100644 --- a/internal/postgres/reconcile.go +++ b/internal/postgres/reconcile.go @@ -10,11 +10,11 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "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/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var ( diff --git a/internal/postgres/reconcile_test.go b/internal/postgres/reconcile_test.go index e8d8c72e8d..d3a5ca407c 100644 --- a/internal/postgres/reconcile_test.go +++ b/internal/postgres/reconcile_test.go @@ -12,11 +12,11 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "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/percona/version" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestDataVolumeMount(t *testing.T) { diff --git a/internal/postgres/users.go b/internal/postgres/users.go index 5a097201d2..ea951a4d9a 100644 --- a/internal/postgres/users.go +++ b/internal/postgres/users.go @@ -13,10 +13,10 @@ import ( pg_query "github.com/pganalyze/pg_query_go/v6" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var RESERVED_SCHEMA_NAMES = map[string]bool{ diff --git a/internal/postgres/users_test.go b/internal/postgres/users_test.go index f7ae838b15..6738d3258c 100644 --- a/internal/postgres/users_test.go +++ b/internal/postgres/users_test.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestSanitizeAlterRoleOptions(t *testing.T) { diff --git a/internal/postgres/validation.go b/internal/postgres/validation.go index ed97d46e3f..48b2523144 100644 --- a/internal/postgres/validation.go +++ b/internal/postgres/validation.go @@ -12,7 +12,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // truncateAt returns s truncated to n bytes, or s unchanged when len(s) <= n. diff --git a/internal/postgres/validation_test.go b/internal/postgres/validation_test.go index cbbe9cf335..c588c637fe 100644 --- a/internal/postgres/validation_test.go +++ b/internal/postgres/validation_test.go @@ -10,10 +10,10 @@ import ( "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestSanitizeLogDirectory(t *testing.T) { diff --git a/internal/registration/interface.go b/internal/registration/interface.go index 75ff2e45b7..bbd11276bb 100644 --- a/internal/registration/interface.go +++ b/internal/registration/interface.go @@ -14,7 +14,7 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type Registration interface { diff --git a/internal/registration/runner.go b/internal/registration/runner.go index b0e47aff52..c71e814429 100644 --- a/internal/registration/runner.go +++ b/internal/registration/runner.go @@ -20,8 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // Runner implements [Registration] by loading and validating the token at a diff --git a/internal/registration/runner_test.go b/internal/registration/runner_test.go index 1143667746..bc132edb84 100644 --- a/internal/registration/runner_test.go +++ b/internal/registration/runner_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/events" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/events" ) func TestNewRunner(t *testing.T) { diff --git a/internal/setuser/postgres.go b/internal/setuser/postgres.go index 7b59a6e352..3e6132dcfb 100644 --- a/internal/setuser/postgres.go +++ b/internal/setuser/postgres.go @@ -3,8 +3,8 @@ package setuser import ( "context" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) // EnableInPostgreSQL installs set_user in every database. diff --git a/internal/setuser/postgres_test.go b/internal/setuser/postgres_test.go index deaab00a59..05c3e5b8b9 100644 --- a/internal/setuser/postgres_test.go +++ b/internal/setuser/postgres_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "gotest.tools/v3/assert" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" ) func TestEnableInPostgreSQL(t *testing.T) { diff --git a/internal/testing/require/kubernetes.go b/internal/testing/require/kubernetes.go index f06a7318f3..04e58ede27 100644 --- a/internal/testing/require/kubernetes.go +++ b/internal/testing/require/kubernetes.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" ) type TestingT interface { diff --git a/internal/testing/validation/postgrescluster_test.go b/internal/testing/validation/postgrescluster_test.go index dc5353595c..2be556d472 100644 --- a/internal/testing/validation/postgrescluster_test.go +++ b/internal/testing/validation/postgrescluster_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPostgresUserOptions(t *testing.T) { diff --git a/internal/upgradecheck/header.go b/internal/upgradecheck/header.go index 7ba344b05e..2675edd386 100644 --- a/internal/upgradecheck/header.go +++ b/internal/upgradecheck/header.go @@ -18,11 +18,11 @@ import ( "k8s.io/client-go/rest" crclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/internal/upgradecheck/header_test.go b/internal/upgradecheck/header_test.go index 763071d0d8..31841bf5e5 100644 --- a/internal/upgradecheck/header_test.go +++ b/internal/upgradecheck/header_test.go @@ -20,12 +20,12 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/client-go/rest" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "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/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGenerateHeader(t *testing.T) { diff --git a/internal/upgradecheck/helpers_test.go b/internal/upgradecheck/helpers_test.go index 7cfedca07c..0b6eff291e 100644 --- a/internal/upgradecheck/helpers_test.go +++ b/internal/upgradecheck/helpers_test.go @@ -20,9 +20,9 @@ import ( crclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type fakeClientWithError struct { diff --git a/internal/upgradecheck/http.go b/internal/upgradecheck/http.go index a65501cf5a..bae98f15f2 100644 --- a/internal/upgradecheck/http.go +++ b/internal/upgradecheck/http.go @@ -17,7 +17,7 @@ import ( crclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" ) var ( diff --git a/internal/upgradecheck/http_test.go b/internal/upgradecheck/http_test.go index aeea7e20c1..1d40855c9f 100644 --- a/internal/upgradecheck/http_test.go +++ b/internal/upgradecheck/http_test.go @@ -20,9 +20,9 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/testing/cmp" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" ) func init() { diff --git a/percona/certmanager/certmanager.go b/percona/certmanager/certmanager.go index e6149a0e87..a3f108d495 100644 --- a/percona/certmanager/certmanager.go +++ b/percona/certmanager/certmanager.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type Controller interface { diff --git a/percona/certmanager/certmanager_test.go b/percona/certmanager/certmanager_test.go index bea8548a93..dcf4a289cd 100644 --- a/percona/certmanager/certmanager_test.go +++ b/percona/certmanager/certmanager_test.go @@ -17,8 +17,8 @@ import ( sigs "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func setupFakeClient(t *testing.T, objs ...sigs.Object) sigs.Client { diff --git a/percona/certmanager/names.go b/percona/certmanager/names.go index 999e3c5c50..1be6042e6b 100644 --- a/percona/certmanager/names.go +++ b/percona/certmanager/names.go @@ -5,8 +5,8 @@ package certmanager import ( - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // Names of the cert-manager Certificate CRs that this controller manages. diff --git a/percona/controller/pgbackup/controller.go b/percona/controller/pgbackup/controller.go index 1ca4ebe27e..eadb189d8c 100644 --- a/percona/controller/pgbackup/controller.go +++ b/percona/controller/pgbackup/controller.go @@ -27,19 +27,19 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/clientcmd" - "github.com/percona/percona-postgresql-operator/v2/percona/controller" - "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgbackup/snapshots" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/pgbackrest" - "github.com/percona/percona-postgresql-operator/v2/percona/watcher" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/clientcmd" + "github.com/percona/percona-postgresql-operator/v3/percona/controller" + "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgbackup/snapshots" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/percona/watcher" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( @@ -94,13 +94,13 @@ func (r *PGBackupReconciler) SetupWithManager(ctx context.Context, mgr manager.M return b.Complete(r) } -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgbackups,verbs=create;get;list;watch;update;delete;patch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgbackups/status,verbs=create;patch;update -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgclusters,verbs=get;list;create;update;patch;watch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgbackups/finalizers,verbs=update;patch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgrestores/finalizers,verbs=update;patch -// +kubebuilder:rbac:groups=upstream.pgv2.percona.com,resources=postgresclusters,verbs=get;list;create;update;patch;watch -// +kubebuilder:rbac:groups=upstream.pgv2.percona.com,resources=postgresclusters/status,verbs=create;update;patch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgbackups,verbs=create;get;list;watch;update;delete;patch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgbackups/status,verbs=create;patch;update +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters,verbs=get;list;create;update;patch;watch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgbackups/finalizers,verbs=update;patch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgrestores/finalizers,verbs=update;patch +// +kubebuilder:rbac:groups=upstream.pgv3.percona.com,resources=postgresclusters,verbs=get;list;create;update;patch;watch +// +kubebuilder:rbac:groups=upstream.pgv3.percona.com,resources=postgresclusters/status,verbs=create;update;patch // +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch func (r *PGBackupReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { diff --git a/percona/controller/pgbackup/controller_test.go b/percona/controller/pgbackup/controller_test.go index cea45200c9..765b0e24c4 100644 --- a/percona/controller/pgbackup/controller_test.go +++ b/percona/controller/pgbackup/controller_test.go @@ -16,10 +16,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestFailIfClusterIsNotReady(t *testing.T) { diff --git a/percona/controller/pgbackup/snapshots/offline.go b/percona/controller/pgbackup/snapshots/offline.go index a435fa0b52..0994176834 100644 --- a/percona/controller/pgbackup/snapshots/offline.go +++ b/percona/controller/pgbackup/snapshots/offline.go @@ -11,12 +11,12 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "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/postgres" - perconaPG "github.com/percona/percona-postgresql-operator/v2/percona/postgres" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + perconaPG "github.com/percona/percona-postgresql-operator/v3/percona/postgres" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) const ( diff --git a/percona/controller/pgbackup/snapshots/reconcile.go b/percona/controller/pgbackup/snapshots/reconcile.go index b287740a72..450d448fdc 100644 --- a/percona/controller/pgbackup/snapshots/reconcile.go +++ b/percona/controller/pgbackup/snapshots/reconcile.go @@ -17,16 +17,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) const ( - annotationBackupTarget = pNaming.PrefixPerconaPGV2 + "backup-target" + annotationBackupTarget = pNaming.PrefixPerconaPGV3 + "backup-target" defaultSnapshotErrorDeadline = 5 * time.Minute ) diff --git a/percona/controller/pgbackup/snapshots/reconcile_test.go b/percona/controller/pgbackup/snapshots/reconcile_test.go index c796c2ca21..4f4459cc4b 100644 --- a/percona/controller/pgbackup/snapshots/reconcile_test.go +++ b/percona/controller/pgbackup/snapshots/reconcile_test.go @@ -15,10 +15,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func TestShouldFailSnapshot(t *testing.T) { @@ -721,7 +721,7 @@ func TestGenerateSnapshotIntent(t *testing.T) { // Owner reference should be set to the backup require.NotEmpty(t, vs.OwnerReferences, "expected owner reference to be set") assert.Equal(t, backupName, vs.OwnerReferences[0].Name) - assert.Equal(t, "pgv2.percona.com/v2", vs.OwnerReferences[0].APIVersion) + assert.Equal(t, "pgv3.percona.com/v2", vs.OwnerReferences[0].APIVersion) assert.Equal(t, "PerconaPGBackup", vs.OwnerReferences[0].Kind) }) } diff --git a/percona/controller/pgbackup/testutils_test.go b/percona/controller/pgbackup/testutils_test.go index c3851a0fa5..fa57fcb9b8 100644 --- a/percona/controller/pgbackup/testutils_test.go +++ b/percona/controller/pgbackup/testutils_test.go @@ -11,10 +11,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type fakeClient struct { diff --git a/percona/controller/pgcluster/backup.go b/percona/controller/pgcluster/backup.go index bb7cda10a2..e9f3b67e2e 100644 --- a/percona/controller/pgcluster/backup.go +++ b/percona/controller/pgcluster/backup.go @@ -15,13 +15,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "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/percona/controller" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/pgbackrest" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/controller" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/pgbackrest" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func (r *PGClusterReconciler) reconcileBackups(ctx context.Context, cr *v2.PerconaPGCluster) error { diff --git a/percona/controller/pgcluster/backup_test.go b/percona/controller/pgcluster/backup_test.go index 35ba0a7558..c6a54fbdc1 100644 --- a/percona/controller/pgcluster/backup_test.go +++ b/percona/controller/pgcluster/backup_test.go @@ -17,10 +17,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func compareMaps(x map[string]string, y map[string]string) bool { diff --git a/percona/controller/pgcluster/controller.go b/percona/controller/pgcluster/controller.go index aacbb4efa1..76a3d38d0c 100644 --- a/percona/controller/pgcluster/controller.go +++ b/percona/controller/pgcluster/controller.go @@ -32,21 +32,21 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "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/postgres" - perconaController "github.com/percona/percona-postgresql-operator/v2/percona/controller" - "github.com/percona/percona-postgresql-operator/v2/percona/extensions" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/pmm" - perconaPG "github.com/percona/percona-postgresql-operator/v2/percona/postgres" - "github.com/percona/percona-postgresql-operator/v2/percona/utils/registry" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - "github.com/percona/percona-postgresql-operator/v2/percona/watcher" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + perconaController "github.com/percona/percona-postgresql-operator/v3/percona/controller" + "github.com/percona/percona-postgresql-operator/v3/percona/extensions" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/pmm" + perconaPG "github.com/percona/percona-postgresql-operator/v3/percona/postgres" + "github.com/percona/percona-postgresql-operator/v3/percona/utils/registry" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + "github.com/percona/percona-postgresql-operator/v3/percona/watcher" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( @@ -211,11 +211,11 @@ func (r *PGClusterReconciler) watchSecrets() handler.TypedFuncs[*corev1.Secret, } } -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgclusters,verbs=get;list;watch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgclusters/status,verbs=patch;update -// +kubebuilder:rbac:groups=upstream.pgv2.percona.com,resources=postgresclusters,verbs=get;list;create;update;patch;delete;watch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters,verbs=get;list;watch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters/status,verbs=patch;update +// +kubebuilder:rbac:groups=upstream.pgv3.percona.com,resources=postgresclusters,verbs=get;list;create;update;patch;delete;watch // +kubebuilder:rbac:groups=apps,resources=replicasets,verbs=create;delete;get;list;patch;watch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgclusters/finalizers,verbs=update +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters/finalizers,verbs=update // +kubebuilder:rbac:groups=batch,resources=jobs,verbs=create;list;update // +kubebuilder:rbac:groups="",resources="pods",verbs=create;delete // +kubebuilder:rbac:groups="",resources="persistentvolumeclaims",verbs=create;update diff --git a/percona/controller/pgcluster/controller_test.go b/percona/controller/pgcluster/controller_test.go index 19f4b17aad..e3c255b586 100644 --- a/percona/controller/pgcluster/controller_test.go +++ b/percona/controller/pgcluster/controller_test.go @@ -23,12 +23,12 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var _ = Describe("PG Cluster", Ordered, func() { @@ -109,7 +109,7 @@ var _ = Describe("Annotations", Ordered, func() { }) It("should create PerconaPGCluster with annotations", func() { - cr.Annotations["pgv2.percona.com/trigger-switchover"] = "true" + cr.Annotations["pgv3.percona.com/trigger-switchover"] = "true" cr.Annotations["egedemo.com/test"] = "true" status := cr.Status diff --git a/percona/controller/pgcluster/finalizer.go b/percona/controller/pgcluster/finalizer.go index 2e0256c909..fe24b9d2e5 100644 --- a/percona/controller/pgcluster/finalizer.go +++ b/percona/controller/pgcluster/finalizer.go @@ -13,11 +13,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/event" - "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/percona/controller" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/controller" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) type finalizerFunc func(context.Context, *v2.PerconaPGCluster) error diff --git a/percona/controller/pgcluster/finalizer_test.go b/percona/controller/pgcluster/finalizer_test.go index e2c94c06c3..7a2a5d1d04 100644 --- a/percona/controller/pgcluster/finalizer_test.go +++ b/percona/controller/pgcluster/finalizer_test.go @@ -18,9 +18,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var _ = Describe("Finalizers", Ordered, func() { diff --git a/percona/controller/pgcluster/gethost_test.go b/percona/controller/pgcluster/gethost_test.go index 27a0e52a09..5394a4f68b 100644 --- a/percona/controller/pgcluster/gethost_test.go +++ b/percona/controller/pgcluster/gethost_test.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGetHost(t *testing.T) { diff --git a/percona/controller/pgcluster/owner_ref_migration.go b/percona/controller/pgcluster/owner_ref_migration.go index 5522c8aef7..ef3381782b 100644 --- a/percona/controller/pgcluster/owner_ref_migration.go +++ b/percona/controller/pgcluster/owner_ref_migration.go @@ -11,10 +11,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" "github.com/pkg/errors" ) diff --git a/percona/controller/pgcluster/patroniversion.go b/percona/controller/pgcluster/patroniversion.go index 9b346797ee..afb9954743 100644 --- a/percona/controller/pgcluster/patroniversion.go +++ b/percona/controller/pgcluster/patroniversion.go @@ -19,12 +19,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "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/percona/clientcmd" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/initialize" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/clientcmd" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func (r *PGClusterReconciler) reconcilePatroniVersionFromCluster(ctx context.Context, cr *v2.PerconaPGCluster) error { diff --git a/percona/controller/pgcluster/patroniversion_distribution_test.go b/percona/controller/pgcluster/patroniversion_distribution_test.go index f77eb9411d..a00cd6494d 100644 --- a/percona/controller/pgcluster/patroniversion_distribution_test.go +++ b/percona/controller/pgcluster/patroniversion_distribution_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func TestGetPostgresDistribution(t *testing.T) { diff --git a/percona/controller/pgcluster/patroniversion_test.go b/percona/controller/pgcluster/patroniversion_test.go index 34cc03c920..f2b5fc188a 100644 --- a/percona/controller/pgcluster/patroniversion_test.go +++ b/percona/controller/pgcluster/patroniversion_test.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) var _ = Describe("patroni version check", Ordered, func() { diff --git a/percona/controller/pgcluster/pvc.go b/percona/controller/pgcluster/pvc.go index 0d8f505edf..fb9e56aa34 100644 --- a/percona/controller/pgcluster/pvc.go +++ b/percona/controller/pgcluster/pvc.go @@ -10,9 +10,9 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func (r *PGClusterReconciler) reconcilePVCs(ctx context.Context, cr *v2.PerconaPGCluster) error { diff --git a/percona/controller/pgcluster/restore.go b/percona/controller/pgcluster/restore.go index 33e58d5598..1db891b8a7 100644 --- a/percona/controller/pgcluster/restore.go +++ b/percona/controller/pgcluster/restore.go @@ -6,9 +6,9 @@ import ( k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) // createBootstrapRestoreObject creates a PerconaPGRestore object for the bootstrap restore diff --git a/percona/controller/pgcluster/schedule.go b/percona/controller/pgcluster/schedule.go index 38f0d2beab..5b7b439f5f 100644 --- a/percona/controller/pgcluster/schedule.go +++ b/percona/controller/pgcluster/schedule.go @@ -11,13 +11,13 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func (r *PGClusterReconciler) reconcileScheduledBackups(ctx context.Context, cr *v2.PerconaPGCluster) error { diff --git a/percona/controller/pgcluster/secret.go b/percona/controller/pgcluster/secret.go index ae1b483e75..dd748b77ac 100644 --- a/percona/controller/pgcluster/secret.go +++ b/percona/controller/pgcluster/secret.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func getEnvFromSecrets(ctx context.Context, cl client.Client, cr *v2.PerconaPGCluster, envFromSource []corev1.EnvFromSource) ([]corev1.Secret, error) { diff --git a/percona/controller/pgcluster/standby.go b/percona/controller/pgcluster/standby.go index c0ce81675b..5bd3dbd27d 100644 --- a/percona/controller/pgcluster/standby.go +++ b/percona/controller/pgcluster/standby.go @@ -15,14 +15,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/event" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "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/postgres" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - perconaPG "github.com/percona/percona-postgresql-operator/v2/percona/postgres" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + perconaPG "github.com/percona/percona-postgresql-operator/v3/percona/postgres" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( diff --git a/percona/controller/pgcluster/standby_test.go b/percona/controller/pgcluster/standby_test.go index 6ae6b8077e..c7781a2da0 100644 --- a/percona/controller/pgcluster/standby_test.go +++ b/percona/controller/pgcluster/standby_test.go @@ -16,10 +16,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestReconcileStandbyLag(t *testing.T) { diff --git a/percona/controller/pgcluster/status.go b/percona/controller/pgcluster/status.go index fa8dbdf6b7..c253840170 100644 --- a/percona/controller/pgcluster/status.go +++ b/percona/controller/pgcluster/status.go @@ -11,12 +11,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func (r *PGClusterReconciler) getHost(ctx context.Context, cr *v2.PerconaPGCluster) (string, error) { diff --git a/percona/controller/pgcluster/status_test.go b/percona/controller/pgcluster/status_test.go index fb610d494e..e76470da28 100644 --- a/percona/controller/pgcluster/status_test.go +++ b/percona/controller/pgcluster/status_test.go @@ -19,10 +19,10 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var _ = Describe("PG Cluster status", Ordered, func() { diff --git a/percona/controller/pgcluster/suite_test.go b/percona/controller/pgcluster/suite_test.go index b5d7a53a9e..fedf9ef9f1 100644 --- a/percona/controller/pgcluster/suite_test.go +++ b/percona/controller/pgcluster/suite_test.go @@ -19,8 +19,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to diff --git a/percona/controller/pgcluster/testutils_test.go b/percona/controller/pgcluster/testutils_test.go index 4e549cfbe6..d6c9bf10b4 100644 --- a/percona/controller/pgcluster/testutils_test.go +++ b/percona/controller/pgcluster/testutils_test.go @@ -18,15 +18,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/event" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/certmanager" - "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgbackup" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/utils/registry" - "github.com/percona/percona-postgresql-operator/v2/percona/watcher" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/postgrescluster" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/certmanager" + "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgbackup" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/utils/registry" + "github.com/percona/percona-postgresql-operator/v3/percona/watcher" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var k8sClient client.Client diff --git a/percona/controller/pgcluster/version.go b/percona/controller/pgcluster/version.go index 3f83c42712..81344cf6e1 100644 --- a/percona/controller/pgcluster/version.go +++ b/percona/controller/pgcluster/version.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/percona/extensions" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/percona/extensions" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func (r *PGClusterReconciler) reconcileVersion(ctx context.Context, cr *v2.PerconaPGCluster) error { diff --git a/percona/controller/pgcluster/version_test.go b/percona/controller/pgcluster/version_test.go index dd401dd26c..4ded211132 100644 --- a/percona/controller/pgcluster/version_test.go +++ b/percona/controller/pgcluster/version_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) var _ = Describe("Ensure Version", Ordered, func() { diff --git a/percona/controller/pgrestore/controller.go b/percona/controller/pgrestore/controller.go index b2f1fef46e..560bd6587a 100644 --- a/percona/controller/pgrestore/controller.go +++ b/percona/controller/pgrestore/controller.go @@ -16,13 +16,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/percona/controller" - "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgrestore/snapshot" - restoreutils "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgrestore/utils" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/percona/controller" + "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgrestore/snapshot" + restoreutils "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgrestore/utils" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) const ( @@ -51,10 +51,10 @@ func (r *PGRestoreReconciler) SetupWithManager(mgr manager.Manager) error { return builder.ControllerManagedBy(mgr).For(&v2.PerconaPGRestore{}).Complete(r) } -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgrestores,verbs=get;list;watch;create;patch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgrestores/status,verbs=patch;update -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgclusters,verbs=get;list;create;update;patch;watch -// +kubebuilder:rbac:groups=upstream.pgv2.percona.com,resources=postgresclusters,verbs=get;list;create;update;patch;watch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgrestores,verbs=get;list;watch;create;patch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgrestores/status,verbs=patch;update +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters,verbs=get;list;create;update;patch;watch +// +kubebuilder:rbac:groups=upstream.pgv3.percona.com,resources=postgresclusters,verbs=get;list;create;update;patch;watch // +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch func (r *PGRestoreReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { diff --git a/percona/controller/pgrestore/snapshot/reconcile.go b/percona/controller/pgrestore/snapshot/reconcile.go index 27dc79bc75..46fb399f01 100644 --- a/percona/controller/pgrestore/snapshot/reconcile.go +++ b/percona/controller/pgrestore/snapshot/reconcile.go @@ -23,16 +23,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/controller" - restoreutils "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgrestore/utils" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - perconaPG "github.com/percona/percona-postgresql-operator/v2/percona/postgres" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/controller" + restoreutils "github.com/percona/percona-postgresql-operator/v3/percona/controller/pgrestore/utils" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + perconaPG "github.com/percona/percona-postgresql-operator/v3/percona/postgres" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type snapshotRestorer struct { diff --git a/percona/controller/pgrestore/snapshot/reconcile_test.go b/percona/controller/pgrestore/snapshot/reconcile_test.go index fa050785de..d383edf9a8 100644 --- a/percona/controller/pgrestore/snapshot/reconcile_test.go +++ b/percona/controller/pgrestore/snapshot/reconcile_test.go @@ -21,12 +21,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestGeneratePrepareJob(t *testing.T) { diff --git a/percona/controller/pgrestore/utils/pgbackrest.go b/percona/controller/pgrestore/utils/pgbackrest.go index 527904f64f..b2a214d528 100644 --- a/percona/controller/pgrestore/utils/pgbackrest.go +++ b/percona/controller/pgrestore/utils/pgbackrest.go @@ -8,9 +8,9 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type PGBackRestRestore struct { diff --git a/percona/controller/pgrestore/utils/pgbackrest_test.go b/percona/controller/pgrestore/utils/pgbackrest_test.go index ed5edb78d6..28c5613eee 100644 --- a/percona/controller/pgrestore/utils/pgbackrest_test.go +++ b/percona/controller/pgrestore/utils/pgbackrest_test.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPGBackRestRestoreStartTolerations(t *testing.T) { diff --git a/percona/controller/pgupgrade/controller.go b/percona/controller/pgupgrade/controller.go index 6f6ea422d4..d3af2f68ed 100644 --- a/percona/controller/pgupgrade/controller.go +++ b/percona/controller/pgupgrade/controller.go @@ -18,10 +18,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/percona/extensions" - pgv2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/percona/extensions" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const ( @@ -36,14 +36,14 @@ type PGUpgradeReconciler struct { // SetupWithManager adds the PerconaPerconaPGUpgrade controller to the provided runtime manager func (r *PGUpgradeReconciler) SetupWithManager(mgr manager.Manager) error { - return builder.ControllerManagedBy(mgr).For(&pgv2.PerconaPGUpgrade{}).Complete(r) + return builder.ControllerManagedBy(mgr).For(&pgv3.PerconaPGUpgrade{}).Complete(r) } -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgupgrades,verbs=get;list;create;update;patch;watch -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgupgrades/status,verbs=patch;update -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgupgrades/finalizers,verbs=patch;update -// +kubebuilder:rbac:groups=pgv2.percona.com,resources=perconapgclusters,verbs=get;list;watch;patch;update -// +kubebuilder:rbac:groups=upstream.pgv2.percona.com,resources=pgupgrades,verbs=get;list;create;update;patch;delete;watch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgupgrades,verbs=get;list;create;update;patch;watch +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgupgrades/status,verbs=patch;update +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgupgrades/finalizers,verbs=patch;update +// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters,verbs=get;list;watch;patch;update +// +kubebuilder:rbac:groups=upstream.pgv3.percona.com,resources=pgupgrades,verbs=get;list;create;update;patch;delete;watch //+kubebuilder:rbac:groups="postgres-operator.crunchydata.com",resources="pgupgrades",verbs={get,list,watch} var errLegacyUpgradeFinalized = errors.New("legacy upgrade is already finished") @@ -51,7 +51,7 @@ var errLegacyUpgradeFinalized = errors.New("legacy upgrade is already finished") func (r *PGUpgradeReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { log := logging.FromContext(ctx).WithValues("request", request) - perconaPGUpgrade := &pgv2.PerconaPGUpgrade{} + perconaPGUpgrade := &pgv3.PerconaPGUpgrade{} if err := r.Client.Get(ctx, request.NamespacedName, perconaPGUpgrade); err != nil { // NotFound cannot be fixed by requeuing so ignore it. During background // deletion, we receive delete events from cluster's dependents after @@ -70,7 +70,7 @@ func (r *PGUpgradeReconciler) Reconcile(ctx context.Context, request reconcile.R return reconcile.Result{}, errors.Wrap(err, "check legacy upgrade") } - pgCluster := &pgv2.PerconaPGCluster{ + pgCluster := &pgv3.PerconaPGCluster{ ObjectMeta: metav1.ObjectMeta{ Name: perconaPGUpgrade.Spec.PostgresClusterName, Namespace: perconaPGUpgrade.Namespace, @@ -162,7 +162,7 @@ func (r *PGUpgradeReconciler) Reconcile(ctx context.Context, request reconcile.R return reconcile.Result{}, nil } -func (r *PGUpgradeReconciler) createPGUpgrade(ctx context.Context, cluster *pgv2.PerconaPGCluster, pgUpgrade *crunchyv1beta1.PGUpgrade, perconaPGUpgrade *pgv2.PerconaPGUpgrade) error { +func (r *PGUpgradeReconciler) createPGUpgrade(ctx context.Context, cluster *pgv3.PerconaPGCluster, pgUpgrade *crunchyv1beta1.PGUpgrade, perconaPGUpgrade *pgv3.PerconaPGUpgrade) error { pgUpgrade.Spec.Metadata = perconaPGUpgrade.Spec.Metadata pgUpgrade.Spec.PostgresClusterName = perconaPGUpgrade.Spec.PostgresClusterName @@ -213,7 +213,7 @@ func (r *PGUpgradeReconciler) createPGUpgrade(ctx context.Context, cluster *pgv2 return r.Client.Create(ctx, pgUpgrade) } -func (r *PGUpgradeReconciler) pauseCluster(ctx context.Context, pgCluster *pgv2.PerconaPGCluster) error { +func (r *PGUpgradeReconciler) pauseCluster(ctx context.Context, pgCluster *pgv3.PerconaPGCluster) error { orig := pgCluster.DeepCopy() t := true @@ -222,7 +222,7 @@ func (r *PGUpgradeReconciler) pauseCluster(ctx context.Context, pgCluster *pgv2. return r.Client.Patch(ctx, pgCluster.DeepCopy(), client.MergeFrom(orig)) } -func (r *PGUpgradeReconciler) resumeCluster(ctx context.Context, pgCluster *pgv2.PerconaPGCluster) error { +func (r *PGUpgradeReconciler) resumeCluster(ctx context.Context, pgCluster *pgv3.PerconaPGCluster) error { orig := pgCluster.DeepCopy() pgCluster.Spec.Pause = nil @@ -230,24 +230,24 @@ func (r *PGUpgradeReconciler) resumeCluster(ctx context.Context, pgCluster *pgv2 return r.Client.Patch(ctx, pgCluster.DeepCopy(), client.MergeFrom(orig)) } -func (r *PGUpgradeReconciler) annotateCluster(ctx context.Context, pgCluster *pgv2.PerconaPGCluster, pgUpgrade *pgv2.PerconaPGUpgrade) error { +func (r *PGUpgradeReconciler) annotateCluster(ctx context.Context, pgCluster *pgv3.PerconaPGCluster, pgUpgrade *pgv3.PerconaPGUpgrade) error { orig := pgCluster.DeepCopy() if pgCluster.Annotations == nil { pgCluster.Annotations = make(map[string]string) } - pgCluster.Annotations[pgv2.AnnotationAllowUpgrade] = pgUpgrade.Name + pgCluster.Annotations[pgv3.AnnotationAllowUpgrade] = pgUpgrade.Name return r.Client.Patch(ctx, pgCluster.DeepCopy(), client.MergeFrom(orig)) } -func (r *PGUpgradeReconciler) finalizeUpgrade(ctx context.Context, pgCluster *pgv2.PerconaPGCluster, pgUpgrade *pgv2.PerconaPGUpgrade) error { +func (r *PGUpgradeReconciler) finalizeUpgrade(ctx context.Context, pgCluster *pgv3.PerconaPGCluster, pgUpgrade *pgv3.PerconaPGUpgrade) error { log := logging.FromContext(ctx) orig := pgCluster.DeepCopy() - delete(pgCluster.Annotations, pgv2.AnnotationAllowUpgrade) + delete(pgCluster.Annotations, pgv3.AnnotationAllowUpgrade) pgCluster.Spec.PostgresVersion = pgUpgrade.Spec.ToPostgresVersion pgCluster.Spec.Image = pgUpgrade.Spec.ToPostgresImage diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml index 4e5579c79a..c088530254 100644 --- a/percona/controller/testdata/sidecar-resources-cr.yaml +++ b/percona/controller/testdata/sidecar-resources-cr.yaml @@ -1,5 +1,5 @@ -apiVersion: pgv2.percona.com/v2 +apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: name: cluster1 diff --git a/percona/controller/utils.go b/percona/controller/utils.go index de76e1ad94..d596e92a2b 100644 --- a/percona/controller/utils.go +++ b/percona/controller/utils.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" ) // jobCompleted returns "true" if the Job provided completed successfully. Otherwise it returns diff --git a/percona/controller/utils_test.go b/percona/controller/utils_test.go index 099e6a138f..39690e27d6 100644 --- a/percona/controller/utils_test.go +++ b/percona/controller/utils_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" ) func TestGetReadyInstancePod(t *testing.T) { diff --git a/percona/extensions/containers.go b/percona/extensions/containers.go index 7ca5b5a9cb..4328b975e1 100644 --- a/percona/extensions/containers.go +++ b/percona/extensions/containers.go @@ -6,8 +6,8 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/percona/naming" - pgv2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/percona/naming" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func GetExtensionKey(pgMajor int, name, version string) string { @@ -16,7 +16,7 @@ func GetExtensionKey(pgMajor int, name, version string) string { // RelocatorContainer returns a container that will relocate extensions from the base image (i.e. pg_stat_monitor, pg_audit) // to the data directory so we don't lose them when user adds a custom extension. -func RelocatorContainer(cr *pgv2.PerconaPGCluster, image string, imagePullPolicy corev1.PullPolicy, postgresVersion int) corev1.Container { +func RelocatorContainer(cr *pgv3.PerconaPGCluster, image string, imagePullPolicy corev1.PullPolicy, postgresVersion int) corev1.Container { mounts := []corev1.VolumeMount{ { Name: "postgres-data", @@ -49,7 +49,7 @@ func RelocatorContainer(cr *pgv2.PerconaPGCluster, image string, imagePullPolicy } } -func InstallerContainer(cr *pgv2.PerconaPGCluster, postgresVersion int, spec *pgv2.ExtensionsSpec, extensions string, openshift *bool) corev1.Container { +func InstallerContainer(cr *pgv3.PerconaPGCluster, postgresVersion int, spec *pgv3.ExtensionsSpec, extensions string, openshift *bool) corev1.Container { mounts := []corev1.VolumeMount{ { Name: "postgres-data", diff --git a/percona/k8s/testutils_test.go b/percona/k8s/testutils_test.go index 33d72bb51a..e36d339b28 100644 --- a/percona/k8s/testutils_test.go +++ b/percona/k8s/testutils_test.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type fakeClient struct { diff --git a/percona/k8s/util.go b/percona/k8s/util.go index 89e5547624..87fa12a988 100644 --- a/percona/k8s/util.go +++ b/percona/k8s/util.go @@ -17,9 +17,9 @@ import ( "k8s.io/client-go/discovery" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) const WatchNamespaceEnvVar = "WATCH_NAMESPACE" diff --git a/percona/k8s/util_test.go b/percona/k8s/util_test.go index 0a2989a35b..6f24eb963c 100644 --- a/percona/k8s/util_test.go +++ b/percona/k8s/util_test.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) type testGetCluster func() *v1beta1.PostgresCluster diff --git a/percona/naming/annotations.go b/percona/naming/annotations.go index c6737e96a2..a2ce740cc4 100644 --- a/percona/naming/annotations.go +++ b/percona/naming/annotations.go @@ -6,7 +6,7 @@ const ( // timestamp), which will be stored in the PostgresCluster status to properly track completion // of the Job. Also used to annotate the backup Job itself as needed to identify the backup // ID associated with a specific manual backup Job. - AnnotationPGBackrestBackup = PrefixPerconaPGV2 + "pgbackrest-backup" + AnnotationPGBackrestBackup = PrefixPerconaPGV3 + "pgbackrest-backup" // AnnotationPGBackrestBackupJobName is the annotation that is added to a PerconaPGClusterBackup. // The value of the annotation will be a name of an existing backup job @@ -20,47 +20,47 @@ const ( // restore. The value of the annotation will be a unique identfier for a restore Job (e.g. a // timestamp), which will be stored in the PostgresCluster status to properly track completion // of the Job. - AnnotationPGBackRestRestore = PrefixPerconaPGV2 + "pgbackrest-restore" + AnnotationPGBackRestRestore = PrefixPerconaPGV3 + "pgbackrest-restore" // AnnotationPMMSecretHash is the annotation that is added to instance annotations to // rollout restart PG pods in case PMM credentials are rotated. - AnnotationPMMSecretHash = PrefixPerconaPGV2 + "pmm-secret-hash" + AnnotationPMMSecretHash = PrefixPerconaPGV3 + "pmm-secret-hash" // AnnotationMonitorUserSecretHash is the annotation that is added to instance annotations to // rollout restart PG pods in case monitor user password is changed. - AnnotationMonitorUserSecretHash = PrefixPerconaPGV2 + "monitor-user-secret-hash" + AnnotationMonitorUserSecretHash = PrefixPerconaPGV3 + "monitor-user-secret-hash" // AnnotationEnvVarsSecretHash is the annotation that is added to // rollout restart pods in case envFrom secret is changed. - AnnotationEnvVarsSecretHash = PrefixPerconaPGV2 + "env-secret-config-hash" + AnnotationEnvVarsSecretHash = PrefixPerconaPGV3 + "env-secret-config-hash" // AnnotationBackupInProgress is the annotation that is added to PerconaPGCluster to // indicate that backup is in progress. - AnnotationBackupInProgress = PrefixPerconaPGV2 + "backup-in-progress" + AnnotationBackupInProgress = PrefixPerconaPGV3 + "backup-in-progress" // AnnotationClusterBootstrapRestore is the annotation that is added to PerconaPGRestore to // indicate that it is a cluster bootstrap restore. - AnnotationClusterBootstrapRestore = PrefixPerconaPGV2 + "cluster-bootstrap-restore" + AnnotationClusterBootstrapRestore = PrefixPerconaPGV3 + "cluster-bootstrap-restore" - AnnotationPatroniVersion = PrefixPerconaPGV2 + "patroni-version" + AnnotationPatroniVersion = PrefixPerconaPGV3 + "patroni-version" // Special annotation to disable `patroni-version-check` by overriding the patroni version with a custom value. - AnnotationCustomPatroniVersion = PrefixPerconaPGV2 + "custom-patroni-version" + AnnotationCustomPatroniVersion = PrefixPerconaPGV3 + "custom-patroni-version" // AnnotationReplicationMainSite is the annotation that is added to a standby PerconaPGCluster to // indicate the name of the main site. // This annotation is set on standby clusters based on pgbackrest only. This is needed to calculate the replication lag. - AnnotationReplicationMainSite = PrefixPerconaPGV2 + "replication-main-site" + AnnotationReplicationMainSite = PrefixPerconaPGV3 + "replication-main-site" // AnnotationInstanceSuspended must be set on the instance StatefulSet to mark // the instance as suspended. - AnnotationInstanceSuspended = PrefixPerconaPGV2 + "instance-suspended" + AnnotationInstanceSuspended = PrefixPerconaPGV3 + "instance-suspended" // AnnotationSnapshotRestore is the annotation added to the data PVCs of a cluster // to indicate the name of the PerconaPGRestore that is restoring the PVC from a snapshot. - AnnotationSnapshotRestore = PrefixPerconaPGV2 + "snapshot-restore" + AnnotationSnapshotRestore = PrefixPerconaPGV3 + "snapshot-restore" // AnnotationPVCsPreparedAt is the annotation added to the PerconaPGRestore which // prepares the PVCs for a snapshot restore. - AnnotationPVCsPreparedAt = PrefixPerconaPGV2 + "pvcs-prepared-at" + AnnotationPVCsPreparedAt = PrefixPerconaPGV3 + "pvcs-prepared-at" ) diff --git a/percona/naming/label.go b/percona/naming/label.go index 55e47ee6d3..228c5c8479 100644 --- a/percona/naming/label.go +++ b/percona/naming/label.go @@ -1,5 +1,5 @@ package naming const ( - LabelOperatorVersion = PrefixPerconaPGV2 + "version" + LabelOperatorVersion = PrefixPerconaPGV3 + "version" ) diff --git a/percona/naming/prefix.go b/percona/naming/prefix.go index 73b78f66a3..e1b18f99b1 100644 --- a/percona/naming/prefix.go +++ b/percona/naming/prefix.go @@ -5,12 +5,12 @@ import "strings" const ( PrefixPercona = "percona.com/" PrefixPerconaInternal = "internal." + PrefixPercona - PrefixPerconaPGV2 = "pgv2.percona.com/" + PrefixPerconaPGV3 = "pgv3.percona.com/" PrefixCrunchy = "postgres-operator.crunchydata.com/" ) func ToCrunchyAnnotation(annotation string) string { - return replacePrefix(annotation, PrefixPerconaPGV2, PrefixCrunchy) + return replacePrefix(annotation, PrefixPerconaPGV3, PrefixCrunchy) } func replacePrefix(s, oldPrefix, newPrefix string) string { diff --git a/percona/pgbackrest/pgbackrest.go b/percona/pgbackrest/pgbackrest.go index d737b14427..0d3b1bf8e2 100644 --- a/percona/pgbackrest/pgbackrest.go +++ b/percona/pgbackrest/pgbackrest.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/clientcmd" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/clientcmd" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) type InfoOutput []InfoStanza diff --git a/percona/pmm/pmm.go b/percona/pmm/pmm.go index 5151479a72..879c8bebb6 100644 --- a/percona/pmm/pmm.go +++ b/percona/pmm/pmm.go @@ -8,8 +8,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/percona/percona-postgresql-operator/v2/internal/postgres" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/postgres" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) const ( diff --git a/percona/pmm/pmm_test.go b/percona/pmm/pmm_test.go index 5fbf6781a0..83a9e343f5 100644 --- a/percona/pmm/pmm_test.go +++ b/percona/pmm/pmm_test.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func TestContainer(t *testing.T) { diff --git a/percona/postgres/common.go b/percona/postgres/common.go index da6cba7371..a14b954426 100644 --- a/percona/postgres/common.go +++ b/percona/postgres/common.go @@ -11,9 +11,9 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) const ( diff --git a/percona/postgres/common_test.go b/percona/postgres/common_test.go index 8570e9d41a..a63967bc5a 100644 --- a/percona/postgres/common_test.go +++ b/percona/postgres/common_test.go @@ -10,9 +10,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func TestGetPrimaryPod(t *testing.T) { diff --git a/percona/runtime/runtime.go b/percona/runtime/runtime.go index a561e7b6cd..8db30b97f0 100644 --- a/percona/runtime/runtime.go +++ b/percona/runtime/runtime.go @@ -9,9 +9,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/manager" - r "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/feature" - "github.com/percona/percona-postgresql-operator/v2/percona/k8s" + r "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/feature" + "github.com/percona/percona-postgresql-operator/v3/percona/k8s" ) // default refresh interval in minutes diff --git a/percona/testutils/client.go b/percona/testutils/client.go index f523333325..9d7542299b 100644 --- a/percona/testutils/client.go +++ b/percona/testutils/client.go @@ -5,22 +5,22 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - pgv2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func BuildFakeClient(initObjs ...client.Object) client.Client { scheme := runtime.NewScheme() perconaTypes := []runtime.Object{ - new(pgv2.PerconaPGCluster), - new(pgv2.PerconaPGClusterList), - new(pgv2.PerconaPGBackup), - new(pgv2.PerconaPGBackupList), - new(pgv2.PerconaPGRestore), - new(pgv2.PerconaPGRestoreList), - new(pgv2.PerconaPGUpgrade), - new(pgv2.PerconaPGUpgradeList), + new(pgv3.PerconaPGCluster), + new(pgv3.PerconaPGClusterList), + new(pgv3.PerconaPGBackup), + new(pgv3.PerconaPGBackupList), + new(pgv3.PerconaPGRestore), + new(pgv3.PerconaPGRestoreList), + new(pgv3.PerconaPGUpgrade), + new(pgv3.PerconaPGUpgradeList), } crunchyTypes := []runtime.Object{ @@ -30,12 +30,12 @@ func BuildFakeClient(initObjs ...client.Object) client.Client { new(crunchyv1beta1.PGUpgradeList), } - scheme.AddKnownTypes(pgv2.GroupVersion, perconaTypes...) + scheme.AddKnownTypes(pgv3.GroupVersion, perconaTypes...) scheme.AddKnownTypes(crunchyv1beta1.GroupVersion, crunchyTypes...) return fake.NewClientBuilder(). WithScheme(scheme). WithObjects(initObjs...). - WithIndex(new(pgv2.PerconaPGBackup), pgv2.IndexFieldPGCluster, pgv2.PGClusterIndexerFunc). + WithIndex(new(pgv3.PerconaPGBackup), pgv3.IndexFieldPGCluster, pgv3.PGClusterIndexerFunc). Build() } diff --git a/percona/version/service/client/api_version_proto_client.go b/percona/version/service/client/api_version_proto_client.go index 5b524bd421..b22a9a26f5 100644 --- a/percona/version/service/client/api_version_proto_client.go +++ b/percona/version/service/client/api_version_proto_client.go @@ -10,7 +10,7 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/percona/percona-postgresql-operator/v2/percona/version/service/client/version_service" + "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client/version_service" ) // Default API version proto HTTP client. diff --git a/percona/version/service/client/version_service/version_service_apply_responses.go b/percona/version/service/client/version_service/version_service_apply_responses.go index 5a19d36520..6edcdb694a 100644 --- a/percona/version/service/client/version_service/version_service_apply_responses.go +++ b/percona/version/service/client/version_service/version_service_apply_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/percona/percona-postgresql-operator/v2/percona/version/service/client/models" + "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client/models" ) // VersionServiceApplyReader is a Reader for the VersionServiceApply structure. diff --git a/percona/version/service/client/version_service/version_service_operator_responses.go b/percona/version/service/client/version_service/version_service_operator_responses.go index 5625dae723..f99913f9de 100644 --- a/percona/version/service/client/version_service/version_service_operator_responses.go +++ b/percona/version/service/client/version_service/version_service_operator_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/percona/percona-postgresql-operator/v2/percona/version/service/client/models" + "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client/models" ) // VersionServiceOperatorReader is a Reader for the VersionServiceOperator structure. diff --git a/percona/version/service/client/version_service/version_service_product_responses.go b/percona/version/service/client/version_service/version_service_product_responses.go index 8bd92d59d8..35a7481578 100644 --- a/percona/version/service/client/version_service/version_service_product_responses.go +++ b/percona/version/service/client/version_service/version_service_product_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/percona/percona-postgresql-operator/v2/percona/version/service/client/models" + "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client/models" ) // VersionServiceProductReader is a Reader for the VersionServiceProduct structure. diff --git a/percona/version/version.go b/percona/version/version.go index 0b6a968abd..c19fe246ab 100644 --- a/percona/version/version.go +++ b/percona/version/version.go @@ -12,14 +12,14 @@ import ( "github.com/pkg/errors" - "github.com/percona/percona-postgresql-operator/v2/percona/version/service/client" - "github.com/percona/percona-postgresql-operator/v2/percona/version/service/client/version_service" + "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client" + "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client/version_service" ) -//go:generate sh -c "yq -i '.metadata.labels.\"pgv2.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgclusters.yaml" -//go:generate sh -c "yq -i '.metadata.labels.\"pgv2.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgbackups.yaml" -//go:generate sh -c "yq -i '.metadata.labels.\"pgv2.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgrestores.yaml" -//go:generate sh -c "yq -i '.metadata.labels.\"pgv2.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgupgrade.yaml" +//go:generate sh -c "yq -i '.metadata.labels.\"pgv3.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgclusters.yaml" +//go:generate sh -c "yq -i '.metadata.labels.\"pgv3.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgbackups.yaml" +//go:generate sh -c "yq -i '.metadata.labels.\"pgv3.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgrestores.yaml" +//go:generate sh -c "yq -i '.metadata.labels.\"pgv3.percona.com/version\" = \"v\" + load(\"version.txt\")' ../../config/crd/patches/versionlabel_in_perconapgupgrade.yaml" //go:embed version.txt var version string diff --git a/percona/version/version_test.go b/percona/version/version_test.go index c2edd5f6e5..1e95e93bae 100644 --- a/percona/version/version_test.go +++ b/percona/version/version_test.go @@ -11,16 +11,16 @@ import ( "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "sigs.k8s.io/yaml" - "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" + "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" ) func TestCRDVersionLabel(t *testing.T) { crdNames := []string{ - "perconapgbackups.pgv2.percona.com", - "perconapgclusters.pgv2.percona.com", - "perconapgrestores.pgv2.percona.com", - "perconapgupgrades.pgv2.percona.com", + "perconapgbackups.pgv3.percona.com", + "perconapgclusters.pgv3.percona.com", + "perconapgrestores.pgv3.percona.com", + "perconapgupgrades.pgv3.percona.com", } _, filename, _, ok := runtime.Caller(0) diff --git a/percona/watcher/wal.go b/percona/watcher/wal.go index cee366961d..d44e429699 100644 --- a/percona/watcher/wal.go +++ b/percona/watcher/wal.go @@ -13,11 +13,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/event" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/percona/clientcmd" - "github.com/percona/percona-postgresql-operator/v2/percona/pgbackrest" - perconaPG "github.com/percona/percona-postgresql-operator/v2/percona/postgres" - pgv2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/percona/clientcmd" + "github.com/percona/percona-postgresql-operator/v3/percona/pgbackrest" + perconaPG "github.com/percona/percona-postgresql-operator/v3/percona/postgres" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) const ( @@ -30,13 +30,13 @@ var ( LatestTimestampIsBeforeBackupStart = errors.New("latest commit timestamp is before backup start timestamp") ) -type WALWatcher func(context.Context, client.Client, chan event.GenericEvent, chan event.DeleteEvent, *pgv2.PerconaPGCluster) +type WALWatcher func(context.Context, client.Client, chan event.GenericEvent, chan event.DeleteEvent, *pgv3.PerconaPGCluster) -func GetWALWatcher(cr *pgv2.PerconaPGCluster) (string, WALWatcher) { +func GetWALWatcher(cr *pgv3.PerconaPGCluster) (string, WALWatcher) { return cr.Namespace + "-" + cr.Name + "-wal-watcher", WatchCommitTimestamps } -func WatchCommitTimestamps(ctx context.Context, cli client.Client, eventChan chan event.GenericEvent, stopChan chan event.DeleteEvent, cr *pgv2.PerconaPGCluster) { +func WatchCommitTimestamps(ctx context.Context, cli client.Client, eventChan chan event.GenericEvent, stopChan chan event.DeleteEvent, cr *pgv3.PerconaPGCluster) { log := logging.FromContext(ctx).WithName("WALWatcher") if !cr.Spec.Backups.IsEnabled() { @@ -80,7 +80,7 @@ func WatchCommitTimestamps(ctx context.Context, cli client.Client, eventChan cha ts, err := GetLatestCommitTimestamp(ctx, cli, execCli, localCr, latestBackup) if err != nil { switch { - case errors.Is(err, PrimaryPodNotFound) && localCr.Status.State != pgv2.AppStateReady: + case errors.Is(err, PrimaryPodNotFound) && localCr.Status.State != pgv3.AppStateReady: log.V(1).Info("Primary pod not found, skipping WAL watcher") case errors.Is(err, LatestTimestampFileNotFound): log.V(1).Info("Latest commit timestamp file not found", "file", LatestCommitTimestampFile) @@ -118,8 +118,8 @@ var ( errNoBackups = errors.New("no backups found") ) -func getLatestBackup(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGCluster) (*pgv2.PerconaPGBackup, error) { - backupList := &pgv2.PerconaPGBackupList{} +func getLatestBackup(ctx context.Context, cli client.Client, cr *pgv3.PerconaPGCluster) (*pgv3.PerconaPGBackup, error) { + backupList := &pgv3.PerconaPGBackupList{} err := cli.List(ctx, backupList, &client.ListOptions{ Namespace: cr.Namespace, FieldSelector: fields.SelectorFromSet(map[string]string{ @@ -134,15 +134,15 @@ func getLatestBackup(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGC return nil, errNoBackups } - latest := &pgv2.PerconaPGBackup{} + latest := &pgv3.PerconaPGBackup{} runningBackupExists := false for _, backup := range backupList.Items { - if ptr.Deref(backup.Spec.Method, pgv2.BackupMethodPGBackrest) == pgv2.BackupMethodVolumeSnapshot { + if ptr.Deref(backup.Spec.Method, pgv3.BackupMethodPGBackrest) == pgv3.BackupMethodVolumeSnapshot { continue } switch backup.Status.State { - case pgv2.BackupSucceeded: + case pgv3.BackupSucceeded: var completedAt *metav1.Time if backup.Status.CompletedAt != nil { @@ -155,7 +155,7 @@ func getLatestBackup(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGC if latest.Status.CompletedAt == nil || completedAt.After(latest.Status.CompletedAt.Time) { latest = &backup } - case pgv2.BackupFailed: + case pgv3.BackupFailed: default: runningBackupExists = true } @@ -172,7 +172,7 @@ func getLatestBackup(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGC } // GetLatestCommitTimestamp gets the timestamp of the latest commit. -func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *clientcmd.Client, cr *pgv2.PerconaPGCluster, backup *pgv2.PerconaPGBackup) (*metav1.Time, error) { +func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *clientcmd.Client, cr *pgv3.PerconaPGCluster, backup *pgv3.PerconaPGBackup) (*metav1.Time, error) { log := logging.FromContext(ctx) primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) @@ -210,7 +210,7 @@ func GetLatestCommitTimestamp(ctx context.Context, cli client.Client, execCli *c return &commitTsMeta, nil } -func getBackupStartTimestamp(ctx context.Context, cli client.Client, cr *pgv2.PerconaPGCluster, backup *pgv2.PerconaPGBackup) (time.Time, error) { +func getBackupStartTimestamp(ctx context.Context, cli client.Client, cr *pgv3.PerconaPGCluster, backup *pgv3.PerconaPGBackup) (time.Time, error) { primary, err := perconaPG.GetPrimaryPod(ctx, cli, cr) if err != nil { return time.Time{}, errors.Wrap(PrimaryPodNotFound, err.Error()) @@ -223,7 +223,7 @@ func getBackupStartTimestamp(ctx context.Context, cli client.Client, cr *pgv2.Pe for _, info := range pgbackrestInfo { for _, b := range info.Backup { - if b.Annotation[pgv2.PGBackrestAnnotationJobName] == backup.Status.JobName { + if b.Annotation[pgv3.PGBackrestAnnotationJobName] == backup.Status.JobName { return time.Unix(b.Timestamp.Start, 0), nil } } diff --git a/percona/watcher/wal_test.go b/percona/watcher/wal_test.go index 18831e015c..e97450dd6f 100644 --- a/percona/watcher/wal_test.go +++ b/percona/watcher/wal_test.go @@ -11,9 +11,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/percona/percona-postgresql-operator/v2/percona/testutils" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - pgv2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/percona/testutils" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) func mustParseTime(layout string, value string) time.Time { @@ -40,7 +40,7 @@ func TestGetLatestBackup(t *testing.T) { { name: "single backup", backups: []client.Object{ - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", @@ -48,11 +48,11 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T21:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T21:23:38Z"), }, @@ -65,7 +65,7 @@ func TestGetLatestBackup(t *testing.T) { { name: "multiple backups, same cluster", backups: []client.Object{ - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", @@ -73,17 +73,17 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T21:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T21:23:38Z"), }, }, }, - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup2", Namespace: "test-ns", @@ -91,11 +91,11 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T22:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T22:24:12Z"), }, @@ -108,7 +108,7 @@ func TestGetLatestBackup(t *testing.T) { { name: "multiple backups, different clusters", backups: []client.Object{ - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", @@ -116,17 +116,17 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T21:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T21:23:38Z"), }, }, }, - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup2", Namespace: "test-ns", @@ -134,17 +134,17 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T22:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T22:24:12Z"), }, }, }, - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup-from-different-cluster", Namespace: "test-ns", @@ -152,11 +152,11 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T22:10:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "different-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T22:14:12Z"), }, @@ -169,7 +169,7 @@ func TestGetLatestBackup(t *testing.T) { { name: "single running backup", backups: []client.Object{ - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", @@ -177,11 +177,11 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T21:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupRunning, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupRunning, }, }, }, @@ -191,7 +191,7 @@ func TestGetLatestBackup(t *testing.T) { { name: "running backup but a backup is already succeeded", backups: []client.Object{ - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", @@ -199,17 +199,17 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T21:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T21:23:38Z"), }, }, }, - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup2", Namespace: "test-ns", @@ -217,11 +217,11 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T22:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupRunning, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupRunning, }, }, }, @@ -231,7 +231,7 @@ func TestGetLatestBackup(t *testing.T) { { name: "K8SPG-772: multiple backups, some has no CompletedAt", backups: []client.Object{ - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", @@ -239,17 +239,17 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T21:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T21:24:12Z"), }, }, }, - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup2", Namespace: "test-ns", @@ -257,14 +257,14 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T22:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, }, }, - &pgv2.PerconaPGBackup{ + &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup3", Namespace: "test-ns", @@ -272,11 +272,11 @@ func TestGetLatestBackup(t *testing.T) { Time: mustParseTime(time.RFC3339, "2024-02-04T23:00:57Z"), }, }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", }, - Status: pgv2.PerconaPGBackupStatus{ - State: pgv2.BackupSucceeded, + Status: pgv3.PerconaPGBackupStatus{ + State: pgv3.BackupSucceeded, CompletedAt: &metav1.Time{ Time: mustParseTime(time.RFC3339, "2024-02-04T23:24:12Z"), }, @@ -293,7 +293,7 @@ func TestGetLatestBackup(t *testing.T) { t.Run(tt.name, func(t *testing.T) { client := testutils.BuildFakeClient(tt.backups...) - cluster := &pgv2.PerconaPGCluster{ + cluster := &pgv3.PerconaPGCluster{ ObjectMeta: metav1.ObjectMeta{ Name: "test-cluster", Namespace: "test-ns", @@ -318,33 +318,33 @@ func TestGetLatestCommitTimestamp(t *testing.T) { tests := map[string]struct { pods []client.Object - backup *pgv2.PerconaPGBackup - cluster *pgv2.PerconaPGCluster + backup *pgv3.PerconaPGBackup + cluster *pgv3.PerconaPGCluster expectedErr error }{ "primary pod not found due to invalid patroni version": { pods: []client.Object{}, - backup: &pgv2.PerconaPGBackup{ + backup: &pgv3.PerconaPGBackup{ ObjectMeta: metav1.ObjectMeta{ Name: "backup1", Namespace: "test-ns", }, - Spec: pgv2.PerconaPGBackupSpec{ + Spec: pgv3.PerconaPGBackupSpec{ PGCluster: "test-cluster", RepoName: new("repo1"), }, }, - cluster: &pgv2.PerconaPGCluster{ + cluster: &pgv3.PerconaPGCluster{ ObjectMeta: metav1.ObjectMeta{ Name: "test-cluster", Namespace: "test-ns", }, - Status: pgv2.PerconaPGClusterStatus{ - Patroni: pgv2.Patroni{ + Status: pgv3.PerconaPGClusterStatus{ + Patroni: pgv3.Patroni{ Version: "error", }, }, - Spec: pgv2.PerconaPGClusterSpec{ + Spec: pgv3.PerconaPGClusterSpec{ CRVersion: version.Version(), }, }, diff --git a/pkg/apis/pgv2.percona.com/v2/groupversion_info.go b/pkg/apis/pgv3.percona.com/v2/groupversion_info.go similarity index 83% rename from pkg/apis/pgv2.percona.com/v2/groupversion_info.go rename to pkg/apis/pgv3.percona.com/v2/groupversion_info.go index c7b59aa43f..2acb586729 100644 --- a/pkg/apis/pgv2.percona.com/v2/groupversion_info.go +++ b/pkg/apis/pgv3.percona.com/v2/groupversion_info.go @@ -1,5 +1,5 @@ // +kubebuilder:object:generate=true -// +groupName=pgv2.percona.com +// +groupName=pgv3.percona.com package v2 import ( @@ -9,7 +9,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "pgv2.percona.com", Version: "v2"} + GroupVersion = schema.GroupVersion{Group: "pgv3.percona.com", Version: "v2"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgbackup_types.go b/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go similarity index 99% rename from pkg/apis/pgv2.percona.com/v2/perconapgbackup_types.go rename to pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go index db38b4ce60..dd6604ee25 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgbackup_types.go +++ b/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go @@ -12,7 +12,7 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func init() { diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgbackup_types_test.go b/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types_test.go similarity index 100% rename from pkg/apis/pgv2.percona.com/v2/perconapgbackup_types_test.go rename to pkg/apis/pgv3.percona.com/v2/perconapgbackup_types_test.go diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go similarity index 99% rename from pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go rename to pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go index 2595f81c1a..09e36e2046 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go @@ -16,12 +16,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/percona/percona-postgresql-operator/v2/internal/config" - "github.com/percona/percona-postgresql-operator/v2/internal/logging" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/config" + "github.com/percona/percona-postgresql-operator/v3/internal/logging" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) var allowedWALLevels = []string{"logical", "replica"} @@ -1324,7 +1324,7 @@ type PerconaPGClusterList struct { Items []PerconaPGCluster `json:"items"` } -const labelPrefix = "pgv2.percona.com/" +const labelPrefix = "pgv3.percona.com/" const ( LabelOperatorVersion = labelPrefix + "version" diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types_test.go b/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types_test.go similarity index 99% rename from pkg/apis/pgv2.percona.com/v2/perconapgcluster_types_test.go rename to pkg/apis/pgv3.percona.com/v2/perconapgcluster_types_test.go index 693640fb24..7c94722976 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types_test.go +++ b/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types_test.go @@ -14,9 +14,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/percona/percona-postgresql-operator/v2/internal/naming" - "github.com/percona/percona-postgresql-operator/v2/percona/version" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/internal/naming" + "github.com/percona/percona-postgresql-operator/v3/percona/version" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func TestPerconaPGCluster_Default(t *testing.T) { diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgrestore_types.go b/pkg/apis/pgv3.percona.com/v2/perconapgrestore_types.go similarity index 100% rename from pkg/apis/pgv2.percona.com/v2/perconapgrestore_types.go rename to pkg/apis/pgv3.percona.com/v2/perconapgrestore_types.go diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgupgrade_types.go b/pkg/apis/pgv3.percona.com/v2/perconapgupgrade_types.go similarity index 97% rename from pkg/apis/pgv2.percona.com/v2/perconapgupgrade_types.go rename to pkg/apis/pgv3.percona.com/v2/perconapgupgrade_types.go index f8ee81aa38..05ea0accf5 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgupgrade_types.go +++ b/pkg/apis/pgv3.percona.com/v2/perconapgupgrade_types.go @@ -4,7 +4,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) func init() { @@ -113,4 +113,4 @@ type PerconaPGUpgradeStatus struct { crunchyv1beta1.PGUpgradeStatus `json:",inline"` } -const AnnotationAllowUpgrade = "pgv2.percona.com/allow-upgrade" +const AnnotationAllowUpgrade = "pgv3.percona.com/allow-upgrade" diff --git a/pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go b/pkg/apis/pgv3.percona.com/v2/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go rename to pkg/apis/pgv3.percona.com/v2/zz_generated.deepcopy.go index 5a0fd062ef..9b865582ab 100644 --- a/pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go +++ b/pkg/apis/pgv3.percona.com/v2/zz_generated.deepcopy.go @@ -9,7 +9,7 @@ package v2 import ( - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/crunchy_bridgecluster_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/crunchy_bridgecluster_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/crunchy_bridgecluster_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/crunchy_bridgecluster_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/groupversion_info.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go similarity index 87% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/groupversion_info.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go index d821dc4512..893b58ae3a 100644 --- a/pkg/apis/upstream.pgv2.percona.com/v1beta1/groupversion_info.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go @@ -4,7 +4,7 @@ // Package v1beta1 contains API Schema definitions for the postgres-operator v1beta1 API group // +kubebuilder:object:generate=true -// +groupName=upstream.pgv2.percona.com +// +groupName=upstream.pgv3.percona.com package v1beta1 import ( @@ -14,7 +14,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "upstream.pgv2.percona.com", Version: "v1beta1"} + GroupVersion = schema.GroupVersion{Group: "upstream.pgv3.percona.com", Version: "v1beta1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/patroni_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/patroni_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/patroni_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/patroni_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgadmin_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgadmin_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/pgadmin_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/pgadmin_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types_test.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types_test.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types_test.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types_test.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbouncer_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbouncer_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbouncer_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbouncer_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgmonitor_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgmonitor_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/pgmonitor_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/pgmonitor_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgupgrade_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgupgrade_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/pgupgrade_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/pgupgrade_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgres_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgres_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/postgres_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/postgres_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_test.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go similarity index 98% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_test.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go index 4dacccf192..ee70244119 100644 --- a/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_test.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go @@ -38,7 +38,7 @@ func TestPostgresClusterDefault(t *testing.T) { b, err := yaml.Marshal(cluster) assert.NilError(t, err) assert.DeepEqual(t, string(b), strings.TrimSpace(` -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: {} spec: @@ -70,7 +70,7 @@ status: b, err := yaml.Marshal(cluster) assert.NilError(t, err) assert.DeepEqual(t, string(b), strings.TrimSpace(` -apiVersion: upstream.pgv2.percona.com/v1beta1 +apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: {} spec: diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_types.go similarity index 99% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_types.go index 43407dd51a..ace77f79a0 100644 --- a/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_types.go @@ -16,7 +16,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" - pNaming "github.com/percona/percona-postgresql-operator/v2/percona/naming" + pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" ) // PostgresClusterSpec defines the desired state of PostgresCluster @@ -912,7 +912,7 @@ func NewPostgresCluster() *PostgresCluster { return cluster } -const LabelVersion = "pgv2.percona.com/version" +const LabelVersion = "pgv3.percona.com/version" func (cr *PostgresCluster) CompareVersion(ver string) int { crVersion, err := gover.NewVersion(cr.Labels[LabelVersion]) diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types_test.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types_test.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types_test.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types_test.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/standalone_pgadmin_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/standalone_pgadmin_types.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/standalone_pgadmin_types.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/standalone_pgadmin_types.go diff --git a/pkg/apis/upstream.pgv2.percona.com/v1beta1/zz_generated.deepcopy.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/upstream.pgv2.percona.com/v1beta1/zz_generated.deepcopy.go rename to pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go