From 1793a01d54cb8d23cc48f5b9f45c92a382e1bd9b Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Tue, 14 Jul 2026 18:30:41 +0500 Subject: [PATCH 01/38] K8SPG-1080 v3 module --- Makefile | 22 ++-- ...ator.crunchydata.com_postgresclusters.yaml | 4 +- build/crd/crunchy/kustomization.yaml | 10 +- .../crunchybridgeclusters/kustomization.yaml | 4 +- ...=> pgv3.percona.com_perconapgbackups.yaml} | 4 +- ...> pgv3.percona.com_perconapgclusters.yaml} | 4 +- ...> pgv3.percona.com_perconapgrestores.yaml} | 4 +- ...> pgv3.percona.com_perconapgupgrades.yaml} | 4 +- build/crd/percona/kustomization.yaml | 8 +- build/crd/pgadmins/kustomization.yaml | 6 +- build/crd/pgupgrades/kustomization.yaml | 6 +- build/crd/postgresclusters/kustomization.yaml | 10 +- build/postgres-operator/Dockerfile | 4 +- cmd/extension-installer/main.go | 2 +- cmd/postgres-operator/main.go | 38 +++--- cmd/postgres-operator/main_test.go | 42 +++--- ...> pgv3.percona.com_perconapgclusters.yaml} | 16 +-- ...v3.percona.com_crunchybridgeclusters.yaml} | 4 +- ...> upstream.pgv3.percona.com_pgadmins.yaml} | 4 +- ...upstream.pgv3.percona.com_pgupgrades.yaml} | 4 +- ...am.pgv3.percona.com_postgresclusters.yaml} | 4 +- config/crd/kustomization.yaml | 10 +- .../versionlabel_in_perconapgbackups.yaml | 4 +- .../versionlabel_in_perconapgclusters.yaml | 4 +- .../versionlabel_in_perconapgrestores.yaml | 4 +- .../versionlabel_in_perconapgupgrade.yaml | 4 +- config/manager/default/kustomization.yaml | 2 +- config/rbac/cluster/role.yaml | 26 ++-- config/rbac/namespace/role.yaml | 26 ++-- deploy/backup.yaml | 2 +- deploy/bundle.yaml | 72 +++++------ deploy/cr.yaml | 2 +- deploy/crd.yaml | 40 +++--- deploy/cw-bundle.yaml | 72 +++++------ deploy/cw-operator.yaml | 6 +- deploy/cw-rbac.yaml | 26 ++-- deploy/operator.yaml | 6 +- deploy/rbac.yaml | 26 ++-- deploy/restore.yaml | 2 +- deploy/upgrade.yaml | 2 +- docs/content/references/crd.md | 18 +-- .../backup-enable-disable/00-assert.yaml | 4 +- .../backup-enable-disable/01-assert.yaml | 10 +- .../backup-enable-disable/02-assert.yaml | 14 +- .../backup-enable-disable/03-assert.yaml | 10 +- .../backup-enable-disable/04-assert.yaml | 14 +- .../backup-enable-disable/05-assert.yaml | 10 +- .../05-disable-backups-datasource.yaml | 2 +- .../backup-enable-disable/07-assert.yaml | 10 +- .../07-disable-backups.yaml | 2 +- .../backup-enable-disable/09-assert.yaml | 2 +- .../09-enable-backups-again.yaml | 2 +- ...10-disable-backups-without-annotation.yaml | 2 +- ...-remove-datasource-cluster-gracefully.yaml | 4 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/backup-enable-disable-spaces.yaml | 2 +- .../conf/backup-enable-disable.yaml | 2 +- .../tests/builtin-extensions/00-assert.yaml | 4 +- .../tests/builtin-extensions/01-assert.yaml | 14 +- .../tests/builtin-extensions/03-assert.yaml | 14 +- .../03-install-all-ext.yaml | 2 +- .../tests/builtin-extensions/06-assert.yaml | 14 +- .../tests/builtin-extensions/09-assert.yaml | 14 +- .../09-uninstall-all-ext.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/cert-manager-tls/00-assert.yaml | 4 +- .../tests/cert-manager-tls/01-assert.yaml | 8 +- .../tests/cert-manager-tls/09-assert.yaml | 12 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/custom-envs/00-assert.yaml | 4 +- e2e-tests/tests/custom-envs/01-assert.yaml | 12 +- e2e-tests/tests/custom-envs/02-assert.yaml | 6 +- e2e-tests/tests/custom-envs/03-assert.yaml | 6 +- e2e-tests/tests/custom-envs/04-assert.yaml | 6 +- e2e-tests/tests/custom-envs/05-assert.yaml | 6 +- e2e-tests/tests/custom-envs/06-assert.yaml | 6 +- e2e-tests/tests/custom-envs/07-assert.yaml | 6 +- e2e-tests/tests/custom-envs/08-assert.yaml | 6 +- e2e-tests/tests/custom-envs/09-assert.yaml | 6 +- e2e-tests/tests/custom-envs/10-assert.yaml | 6 +- e2e-tests/tests/custom-envs/11-assert.yaml | 6 +- e2e-tests/tests/custom-envs/12-assert.yaml | 6 +- e2e-tests/tests/custom-envs/13-assert.yaml | 6 +- e2e-tests/tests/custom-envs/14-assert.yaml | 6 +- e2e-tests/tests/custom-envs/15-assert.yaml | 6 +- e2e-tests/tests/custom-envs/16-assert.yaml | 6 +- e2e-tests/tests/custom-envs/17-assert.yaml | 6 +- e2e-tests/tests/custom-envs/18-assert.yaml | 6 +- e2e-tests/tests/custom-envs/19-assert.yaml | 6 +- e2e-tests/tests/custom-envs/20-assert.yaml | 6 +- e2e-tests/tests/custom-envs/21-assert.yaml | 6 +- e2e-tests/tests/custom-envs/22-assert.yaml | 6 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/custom-extensions/00-assert.yaml | 4 +- .../tests/custom-extensions/01-assert.yaml | 14 +- .../tests/custom-extensions/02-assert.yaml | 4 +- .../custom-extensions/02-install-pg_cron.yaml | 2 +- .../tests/custom-extensions/05-assert.yaml | 4 +- .../tests/custom-extensions/06-assert.yaml | 4 +- .../06-uninstall-pg_cron.yaml | 2 +- .../tests/custom-extensions/07-assert.yaml | 4 +- .../tests/custom-extensions/10-assert.yaml | 14 +- .../tests/custom-extensions/11-assert.yaml | 4 +- .../custom-extensions/11-install-pg_cron.yaml | 2 +- .../tests/custom-extensions/14-assert.yaml | 4 +- .../custom-extensions/14-update-pg_cron.yaml | 2 +- .../tests/custom-extensions/15-assert.yaml | 4 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/custom-extensions.yaml | 2 +- e2e-tests/tests/custom-tls/00-assert.yaml | 4 +- e2e-tests/tests/custom-tls/03-assert.yaml | 12 +- e2e-tests/tests/custom-tls/11-assert.yaml | 10 +- e2e-tests/tests/custom-tls/12-assert.yaml | 10 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/database-init-sql/00-assert.yaml | 4 +- .../tests/database-init-sql/02-assert.yaml | 10 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 12 +- .../04-assert.yaml | 4 +- .../04-create-backup-snapshot.yaml | 2 +- .../05-assert.yaml | 6 +- .../05-create-restore.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-create-backup-pgbackrest.yaml | 2 +- .../08-assert.yaml | 4 +- .../08-create-backup-snapshot.yaml | 2 +- .../09-assert.yaml | 6 +- .../09-create-restore-pitr.yaml | 2 +- .../11-assert.yaml | 12 +- .../99-cleanup.yaml | 8 +- e2e-tests/tests/demand-backup/00-assert.yaml | 4 +- e2e-tests/tests/demand-backup/01-assert.yaml | 12 +- e2e-tests/tests/demand-backup/04-assert.yaml | 6 +- .../demand-backup/04-create-backup-repo1.yaml | 6 +- .../05-check-pgbackrest-info-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/06-assert.yaml | 6 +- .../demand-backup/06-create-backup-repo3.yaml | 2 +- .../07-check-pgbackrest-info-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/08-assert.yaml | 6 +- .../08-create-second-backup-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/10-assert.yaml | 6 +- .../10-create-second-backup-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/11-assert.yaml | 6 +- .../11-create-third-backup-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/14-assert.yaml | 8 +- .../14-recreate-backup-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/15-assert.yaml | 8 +- .../15-recreate-backup-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/18-assert.yaml | 8 +- .../18-create-restore-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/19-assert.yaml | 6 +- e2e-tests/tests/demand-backup/21-assert.yaml | 6 +- .../21-create-restore-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/22-assert.yaml | 6 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/demand-backup-spaces.yaml | 2 +- .../demand-backup/conf/demand-backup.yaml | 2 +- .../dynamic-configuration/00-assert.yaml | 4 +- .../dynamic-configuration/01-assert.yaml | 12 +- .../02-apply-configuration.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/finalizers/00-assert.yaml | 4 +- e2e-tests/tests/finalizers/01-assert.yaml | 14 +- .../tests/finalizers/02-delete-cluster.yaml | 2 +- e2e-tests/tests/finalizers/03-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/huge-pages/00-assert.yaml | 4 +- e2e-tests/tests/huge-pages/01-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/huge-pages/conf/huge-pages-aks.yaml | 2 +- e2e-tests/tests/init-deploy/00-assert.yaml | 4 +- e2e-tests/tests/init-deploy/01-assert.yaml | 14 +- e2e-tests/tests/init-deploy/05-assert.yaml | 22 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/k8s-upgrade/01-assert.yaml | 8 +- .../tests/k8s-upgrade/04-create-backup.yaml | 2 +- .../tests/k8s-upgrade/09-restore-backup.yaml | 2 +- .../k8s-upgrade/conf/k8s-upgrade-spaces.yaml | 2 +- .../tests/k8s-upgrade/conf/k8s-upgrade.yaml | 2 +- e2e-tests/tests/ldap-tls/00-assert.yaml | 4 +- e2e-tests/tests/ldap-tls/03-assert.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/ldap/00-assert.yaml | 4 +- e2e-tests/tests/ldap/02-assert.yaml | 2 +- .../ldap/99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/ldap/files/cluster.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 +- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-14-to-15-postgis.yaml | 2 +- .../major-upgrade-14-to-15/00-assert.yaml | 4 +- .../major-upgrade-14-to-15/01-assert.yaml | 14 +- .../major-upgrade-14-to-15/04-assert.yaml | 6 +- .../major-upgrade-14-to-15/04-upgrade.yaml | 2 +- .../major-upgrade-14-to-15/07-assert.yaml | 4 +- .../major-upgrade-14-to-15/07-run-backup.yaml | 2 +- .../major-upgrade-14-to-15/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-14-to-15.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 +- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-15-to-16-postgis.yaml | 2 +- .../major-upgrade-15-to-16/00-assert.yaml | 4 +- .../major-upgrade-15-to-16/01-assert.yaml | 14 +- .../major-upgrade-15-to-16/04-assert.yaml | 6 +- .../major-upgrade-15-to-16/04-upgrade.yaml | 2 +- .../major-upgrade-15-to-16/07-assert.yaml | 4 +- .../major-upgrade-15-to-16/07-run-backup.yaml | 2 +- .../major-upgrade-15-to-16/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-15-to-16.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 +- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-16-to-17-postgis.yaml | 2 +- .../major-upgrade-16-to-17/00-assert.yaml | 4 +- .../major-upgrade-16-to-17/01-assert.yaml | 14 +- .../major-upgrade-16-to-17/04-assert.yaml | 6 +- .../major-upgrade-16-to-17/04-upgrade.yaml | 2 +- .../major-upgrade-16-to-17/07-assert.yaml | 4 +- .../major-upgrade-16-to-17/07-run-backup.yaml | 2 +- .../major-upgrade-16-to-17/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-16-to-17.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 +- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-17-to-18-postgis.yaml | 2 +- .../major-upgrade-17-to-18/00-assert.yaml | 4 +- .../major-upgrade-17-to-18/01-assert.yaml | 14 +- .../major-upgrade-17-to-18/04-assert.yaml | 6 +- .../major-upgrade-17-to-18/04-upgrade.yaml | 2 +- .../major-upgrade-17-to-18/07-assert.yaml | 4 +- .../major-upgrade-17-to-18/07-run-backup.yaml | 2 +- .../major-upgrade-17-to-18/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-17-to-18.yaml | 2 +- .../tests/migration-backup-s3/08-assert.yaml | 4 +- .../tests/migration-backup-s3/09-assert.yaml | 12 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../migration-data-volumes/05-assert.yaml | 4 +- .../migration-data-volumes/09-assert.yaml | 16 +-- .../99-remove-cluster-gracefully.yaml | 4 +- .../04-assert.yaml | 14 +- .../06-assert.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-backup.yaml | 2 +- .../08-assert.yaml | 8 +- .../08-restore.yaml | 2 +- .../11-assert.yaml | 4 +- .../11-backup.yaml | 2 +- .../12-assert.yaml | 8 +- .../12-restore.yaml | 2 +- .../99-cleanup.yaml | 4 +- .../conf/percona-restored.yaml | 2 +- .../migration-from-crunchy-pv/04-assert.yaml | 6 +- .../migration-from-crunchy-pv/06-assert.yaml | 4 +- .../migration-from-crunchy-pv/06-backup.yaml | 2 +- .../migration-from-crunchy-pv/07-assert.yaml | 8 +- .../migration-from-crunchy-pv/07-restore.yaml | 2 +- .../migration-from-crunchy-pv/99-cleanup.yaml | 4 +- .../conf/percona-migrated.yaml | 2 +- .../00-assert.yaml | 4 +- .../04-assert.yaml | 8 +- .../10-assert.yaml | 4 +- .../12-assert.yaml | 4 +- .../12-backup.yaml | 2 +- .../13-assert.yaml | 8 +- .../13-restore.yaml | 2 +- .../99-cleanup.yaml | 4 +- .../conf/percona-standby.yaml | 2 +- .../tests/monitoring-pmm3/00-assert.yaml | 4 +- .../tests/monitoring-pmm3/03-assert.yaml | 8 +- .../tests/monitoring-pmm3/04-assert.yaml | 8 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/monitoring/00-assert.yaml | 4 +- e2e-tests/tests/monitoring/03-assert.yaml | 8 +- e2e-tests/tests/monitoring/04-assert.yaml | 8 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/one-pod/00-assert.yaml | 4 +- e2e-tests/tests/one-pod/01-assert.yaml | 12 +- e2e-tests/tests/one-pod/04-assert.yaml | 4 +- e2e-tests/tests/one-pod/04-create-backup.yaml | 2 +- .../one-pod/05-check-pgbackrest-info.yaml | 2 +- e2e-tests/tests/one-pod/07-assert.yaml | 6 +- .../tests/one-pod/07-create-restore.yaml | 2 +- e2e-tests/tests/one-pod/08-assert.yaml | 6 +- .../one-pod/99-remove-cluster-gracefully.yaml | 4 +- .../operator-self-healing/00-assert.yaml | 4 +- .../operator-self-healing/02-assert.yaml | 14 +- .../operator-self-healing/05-assert.yaml | 4 +- .../operator-self-healing/06-assert.yaml | 4 +- .../operator-self-healing/07-assert.yaml | 4 +- .../operator-self-healing/08-assert.yaml | 4 +- .../operator-self-healing/09-assert.yaml | 4 +- .../operator-self-healing/10-assert.yaml | 4 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../pg-tde/99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/pitr/00-assert.yaml | 4 +- e2e-tests/tests/pitr/01-assert.yaml | 12 +- e2e-tests/tests/pitr/04-assert.yaml | 4 +- e2e-tests/tests/pitr/04-create-backup.yaml | 2 +- e2e-tests/tests/pitr/05-assert.yaml | 6 +- e2e-tests/tests/pitr/05-create-restore.yaml | 2 +- e2e-tests/tests/pitr/07-assert.yaml | 4 +- e2e-tests/tests/pitr/07-create-backup.yaml | 2 +- .../pitr/99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/scaling/00-assert.yaml | 4 +- e2e-tests/tests/scaling/01-assert.yaml | 14 +- e2e-tests/tests/scaling/04-assert.yaml | 14 +- e2e-tests/tests/scaling/07-assert.yaml | 14 +- e2e-tests/tests/scaling/10-assert.yaml | 14 +- e2e-tests/tests/scaling/13-assert.yaml | 14 +- .../scaling/99-remove-cluster-gracefully.yaml | 4 +- .../tests/scheduled-backup/00-assert.yaml | 4 +- .../tests/scheduled-backup/01-assert.yaml | 12 +- .../tests/scheduled-backup/03-assert.yaml | 4 +- .../tests/scheduled-backup/04-assert.yaml | 8 +- .../tests/scheduled-backup/05-assert.yaml | 2 +- .../tests/scheduled-backup/06-assert.yaml | 6 +- .../tests/scheduled-backup/08-assert.yaml | 8 +- .../tests/scheduled-backup/09-assert.yaml | 10 +- .../tests/scheduled-backup/11-assert.yaml | 6 +- .../11-start-repo1-restore.yaml | 2 +- .../tests/scheduled-backup/14-assert.yaml | 6 +- .../14-start-repo2-restore.yaml | 2 +- .../tests/scheduled-backup/17-assert.yaml | 6 +- .../17-start-repo3-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/scheduled-backup-spaces.yaml | 2 +- .../conf/scheduled-backup.yaml | 2 +- e2e-tests/tests/self-healing/00-assert.yaml | 4 +- e2e-tests/tests/self-healing/02-assert.yaml | 14 +- e2e-tests/tests/self-healing/05-assert.yaml | 14 +- e2e-tests/tests/self-healing/08-assert.yaml | 14 +- e2e-tests/tests/self-healing/11-assert.yaml | 14 +- e2e-tests/tests/self-healing/14-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/sidecars/00-assert.yaml | 4 +- e2e-tests/tests/sidecars/01-assert.yaml | 16 +-- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/standby-pgbackrest/00-assert.yaml | 4 +- .../tests/standby-pgbackrest/01-assert.yaml | 12 +- .../tests/standby-pgbackrest/02-assert.yaml | 12 +- .../tests/standby-pgbackrest/10-assert.yaml | 12 +- .../tests/standby-pgbackrest/99-cleanup.yaml | 8 +- .../conf/source-cluster-spaces.yaml | 2 +- .../conf/source-cluster.yaml | 2 +- .../conf/standby-cluster-spaces.yaml | 2 +- .../conf/standby-cluster.yaml | 2 +- .../tests/standby-streaming/00-assert.yaml | 4 +- .../tests/standby-streaming/01-assert.yaml | 12 +- .../tests/standby-streaming/02-assert.yaml | 12 +- .../tests/standby-streaming/10-assert.yaml | 12 +- .../tests/standby-streaming/99-cleanup.yaml | 8 +- .../tests/start-from-backup/00-assert.yaml | 4 +- .../tests/start-from-backup/01-assert.yaml | 12 +- .../tests/start-from-backup/04-assert.yaml | 6 +- .../04-create-backup-repo1.yaml | 2 +- .../05-delete-source-cluster.yaml | 4 +- .../tests/start-from-backup/06-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/start-from-backup-source-spaces.yaml | 2 +- .../conf/start-from-backup-source.yaml | 2 +- .../conf/start-from-backup-spaces.yaml | 2 +- .../conf/start-from-backup.yaml | 2 +- e2e-tests/tests/tablespaces/00-assert.yaml | 4 +- e2e-tests/tests/tablespaces/01-assert.yaml | 12 +- e2e-tests/tests/tablespaces/05-assert.yaml | 4 +- .../tests/tablespaces/05-create-backup.yaml | 2 +- e2e-tests/tests/tablespaces/08-assert.yaml | 6 +- .../tests/tablespaces/08-create-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/telemetry-transfer/01-assert.yaml | 4 +- .../tests/telemetry-transfer/02-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/upgrade-consistency/00-assert.yaml | 4 +- .../tests/upgrade-consistency/01-assert.yaml | 14 +- .../tests/upgrade-consistency/02-assert.yaml | 14 +- .../tests/upgrade-consistency/03-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/upgrade-minor/00-assert.yaml | 4 +- e2e-tests/tests/upgrade-minor/01-assert.yaml | 14 +- e2e-tests/tests/upgrade-minor/04-assert.yaml | 4 +- e2e-tests/tests/upgrade-minor/05-assert.yaml | 12 +- e2e-tests/tests/upgrade-minor/06-assert.yaml | 14 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/users/00-assert.yaml | 4 +- e2e-tests/tests/users/01-assert.yaml | 14 +- e2e-tests/tests/users/07-assert.yaml | 6 +- e2e-tests/tests/users/13-assert.yaml | 6 +- e2e-tests/tests/users/16-assert.yaml | 6 +- .../users/99-remove-cluster-gracefully.yaml | 4 +- .../crunchybridgecluster.yaml | 2 +- examples/pgadmin/pgadmin.yaml | 2 +- examples/postgrescluster/postgrescluster.yaml | 2 +- go.mod | 2 +- hack/create-todo-patch.sh | 6 +- .../olm/config/examples/pgadmin.example.yaml | 2 +- .../config/examples/pgupgrade.example.yaml | 2 +- .../examples/postgrescluster.example.yaml | 2 +- internal/bridge/client.go | 2 +- .../crunchybridgecluster_controller.go | 18 +-- .../crunchybridgecluster_controller_test.go | 10 +- .../bridge/crunchybridgecluster/delete.go | 4 +- .../crunchybridgecluster/delete_test.go | 4 +- .../crunchybridgecluster/helpers_test.go | 6 +- .../crunchybridgecluster/mock_bridge_api.go | 4 +- .../bridge/crunchybridgecluster/postgres.go | 6 +- .../crunchybridgecluster/postgres_test.go | 6 +- .../bridge/crunchybridgecluster/watches.go | 6 +- .../crunchybridgecluster/watches_test.go | 2 +- internal/bridge/installation.go | 6 +- internal/bridge/installation_test.go | 4 +- internal/config/config.go | 2 +- internal/config/config_test.go | 2 +- internal/controller/pgupgrade/jobs.go | 8 +- internal/controller/pgupgrade/jobs_test.go | 10 +- internal/controller/pgupgrade/labels.go | 2 +- .../pgupgrade/pgupgrade_controller.go | 22 ++-- internal/controller/pgupgrade/registration.go | 4 +- .../controller/pgupgrade/registration_test.go | 10 +- internal/controller/pgupgrade/utils.go | 4 +- internal/controller/pgupgrade/world.go | 4 +- internal/controller/pgupgrade/world_test.go | 4 +- internal/controller/postgrescluster/apply.go | 2 +- .../controller/postgrescluster/apply_test.go | 2 +- .../controller/postgrescluster/cluster.go | 12 +- .../postgrescluster/cluster_test.go | 16 +-- .../controller/postgrescluster/controller.go | 46 +++---- .../postgrescluster/controller_ref_manager.go | 8 +- .../controller_ref_manager_test.go | 4 +- .../postgrescluster/controller_test.go | 10 +- internal/controller/postgrescluster/delete.go | 6 +- .../postgrescluster/helpers_test.go | 8 +- .../controller/postgrescluster/instance.go | 28 ++-- .../postgrescluster/instance_rollout_test.go | 6 +- .../postgrescluster/instance_test.go | 14 +- .../controller/postgrescluster/patroni.go | 16 +-- .../postgrescluster/patroni_test.go | 10 +- .../controller/postgrescluster/pgadmin.go | 14 +- .../postgrescluster/pgadmin_test.go | 12 +- .../controller/postgrescluster/pgbackrest.go | 30 ++--- .../postgrescluster/pgbackrest_test.go | 26 ++-- .../controller/postgrescluster/pgbouncer.go | 16 +-- .../postgrescluster/pgbouncer_test.go | 10 +- .../controller/postgrescluster/pgmonitor.go | 20 +-- .../postgrescluster/pgmonitor_test.go | 10 +- internal/controller/postgrescluster/pki.go | 10 +- .../controller/postgrescluster/pki_test.go | 14 +- .../postgrescluster/pod_disruption_budget.go | 2 +- .../pod_disruption_budget_test.go | 4 +- .../controller/postgrescluster/postgres.go | 32 ++--- .../postgrescluster/postgres_test.go | 18 +-- internal/controller/postgrescluster/rbac.go | 6 +- .../controller/postgrescluster/snapshots.go | 16 +-- .../postgrescluster/snapshots_test.go | 14 +- .../controller/postgrescluster/suite_test.go | 4 +- .../postgrescluster/topology_test.go | 2 +- internal/controller/postgrescluster/util.go | 6 +- .../controller/postgrescluster/util_test.go | 6 +- .../controller/postgrescluster/volumes.go | 12 +- .../postgrescluster/volumes_test.go | 12 +- .../controller/postgrescluster/watches.go | 4 +- .../controller/runtime/conversion_test.go | 2 +- internal/controller/runtime/runtime.go | 4 +- .../standalone_pgadmin/configmap.go | 6 +- .../standalone_pgadmin/configmap_test.go | 6 +- .../standalone_pgadmin/controller.go | 14 +- .../standalone_pgadmin/controller_test.go | 4 +- .../standalone_pgadmin/helpers_test.go | 2 +- .../standalone_pgadmin/helpers_unit_test.go | 2 +- internal/controller/standalone_pgadmin/pod.go | 8 +- .../controller/standalone_pgadmin/pod_test.go | 4 +- .../standalone_pgadmin/postgrescluster.go | 8 +- .../controller/standalone_pgadmin/service.go | 6 +- .../standalone_pgadmin/service_test.go | 4 +- .../standalone_pgadmin/statefulset.go | 6 +- .../standalone_pgadmin/statefulset_test.go | 8 +- .../controller/standalone_pgadmin/users.go | 6 +- .../standalone_pgadmin/users_test.go | 10 +- .../controller/standalone_pgadmin/volume.go | 4 +- .../standalone_pgadmin/volume_test.go | 12 +- .../controller/standalone_pgadmin/watches.go | 4 +- .../standalone_pgadmin/watches_test.go | 4 +- internal/initialize/intstr_test.go | 2 +- internal/initialize/metadata_test.go | 2 +- internal/initialize/primitives_test.go | 2 +- internal/initialize/security_test.go | 2 +- internal/naming/labels.go | 2 +- internal/naming/names.go | 4 +- internal/naming/names_test.go | 2 +- internal/naming/selectors.go | 2 +- internal/naming/selectors_test.go | 2 +- internal/naming/telemetry.go | 2 +- internal/patroni/api.go | 2 +- internal/patroni/certificates_test.go | 2 +- internal/patroni/config.go | 8 +- internal/patroni/config_test.go | 26 ++-- internal/patroni/rbac.go | 2 +- internal/patroni/rbac_test.go | 4 +- internal/patroni/reconcile.go | 16 +-- internal/patroni/reconcile_test.go | 14 +- internal/pgadmin/config.go | 2 +- internal/pgadmin/config_test.go | 6 +- internal/pgadmin/reconcile.go | 8 +- internal/pgadmin/reconcile_test.go | 6 +- internal/pgadmin/users.go | 6 +- internal/pgadmin/users_test.go | 4 +- internal/pgaudit/postgres.go | 4 +- internal/pgaudit/postgres_test.go | 2 +- internal/pgbackrest/certificates_test.go | 2 +- internal/pgbackrest/config.go | 10 +- internal/pgbackrest/config_test.go | 12 +- internal/pgbackrest/pgbackrest.go | 2 +- internal/pgbackrest/pgbackrest_test.go | 4 +- internal/pgbackrest/postgres.go | 4 +- internal/pgbackrest/postgres_test.go | 10 +- internal/pgbackrest/rbac.go | 2 +- internal/pgbackrest/rbac_test.go | 4 +- internal/pgbackrest/reconcile.go | 14 +- internal/pgbackrest/reconcile_test.go | 10 +- internal/pgbackrest/util.go | 2 +- internal/pgbackrest/util_test.go | 2 +- internal/pgbouncer/certificates_test.go | 2 +- internal/pgbouncer/config.go | 6 +- internal/pgbouncer/config_test.go | 10 +- internal/pgbouncer/postgres.go | 8 +- internal/pgbouncer/reconcile.go | 14 +- internal/pgbouncer/reconcile_test.go | 12 +- internal/pgcron/postgres.go | 4 +- internal/pgcron/postgres_test.go | 2 +- internal/pgmonitor/api.go | 2 +- internal/pgmonitor/exporter.go | 4 +- internal/pgmonitor/exporter_test.go | 4 +- internal/pgmonitor/postgres.go | 6 +- internal/pgmonitor/postgres_test.go | 4 +- internal/pgmonitor/util.go | 4 +- internal/pgmonitor/util_test.go | 2 +- internal/pgrepack/postgres.go | 4 +- internal/pgstatmonitor/pgstatmonitor.go | 4 +- internal/pgstatmonitor/pgstatmonitor_test.go | 2 +- internal/pgstatstatements/pgstatstatement.go | 4 +- .../pgstatstatements/pgstatstatement_test.go | 2 +- internal/pgvector/postgres.go | 4 +- internal/pki/encoding_test.go | 2 +- internal/pki/pki_test.go | 2 +- internal/pmm/hba.go | 4 +- internal/postgis/postgis.go | 4 +- internal/postgres/config.go | 8 +- internal/postgres/config_test.go | 6 +- internal/postgres/databases.go | 2 +- internal/postgres/databases_test.go | 2 +- internal/postgres/exec_test.go | 2 +- internal/postgres/hba_test.go | 2 +- internal/postgres/huge_pages.go | 2 +- internal/postgres/huge_pages_test.go | 2 +- internal/postgres/reconcile.go | 10 +- internal/postgres/reconcile_test.go | 10 +- internal/postgres/users.go | 8 +- internal/postgres/users_test.go | 4 +- internal/postgres/validation.go | 2 +- internal/postgres/validation_test.go | 8 +- internal/registration/interface.go | 2 +- internal/registration/runner.go | 4 +- internal/registration/runner_test.go | 2 +- internal/setuser/postgres.go | 4 +- internal/setuser/postgres_test.go | 2 +- internal/testing/require/kubernetes.go | 2 +- .../validation/postgrescluster_test.go | 6 +- internal/upgradecheck/header.go | 10 +- internal/upgradecheck/header_test.go | 12 +- internal/upgradecheck/helpers_test.go | 6 +- internal/upgradecheck/http.go | 2 +- internal/upgradecheck/http_test.go | 6 +- percona/certmanager/certmanager.go | 4 +- percona/certmanager/certmanager_test.go | 4 +- percona/certmanager/names.go | 4 +- percona/controller/pgbackup/controller.go | 40 +++--- .../controller/pgbackup/controller_test.go | 8 +- .../controller/pgbackup/snapshots/offline.go | 12 +- .../pgbackup/snapshots/reconcile.go | 14 +- .../pgbackup/snapshots/reconcile_test.go | 10 +- percona/controller/pgbackup/testutils_test.go | 8 +- percona/controller/pgcluster/backup.go | 14 +- percona/controller/pgcluster/backup_test.go | 8 +- percona/controller/pgcluster/controller.go | 38 +++--- .../controller/pgcluster/controller_test.go | 14 +- percona/controller/pgcluster/finalizer.go | 10 +- .../controller/pgcluster/finalizer_test.go | 6 +- percona/controller/pgcluster/gethost_test.go | 4 +- .../pgcluster/owner_ref_migration.go | 8 +- .../controller/pgcluster/patroniversion.go | 12 +- .../patroniversion_distribution_test.go | 2 +- .../pgcluster/patroniversion_test.go | 4 +- percona/controller/pgcluster/pvc.go | 6 +- percona/controller/pgcluster/restore.go | 6 +- percona/controller/pgcluster/schedule.go | 14 +- percona/controller/pgcluster/secret.go | 2 +- percona/controller/pgcluster/standby.go | 16 +-- percona/controller/pgcluster/standby_test.go | 8 +- percona/controller/pgcluster/status.go | 12 +- percona/controller/pgcluster/status_test.go | 8 +- percona/controller/pgcluster/suite_test.go | 4 +- .../controller/pgcluster/testutils_test.go | 18 +-- percona/controller/pgcluster/version.go | 10 +- percona/controller/pgcluster/version_test.go | 4 +- percona/controller/pgrestore/controller.go | 22 ++-- .../pgrestore/snapshot/reconcile.go | 20 +-- .../pgrestore/snapshot/reconcile_test.go | 12 +- .../controller/pgrestore/utils/pgbackrest.go | 6 +- .../pgrestore/utils/pgbackrest_test.go | 4 +- percona/controller/pgupgrade/controller.go | 38 +++--- .../testdata/sidecar-resources-cr.yaml | 2 +- percona/controller/utils.go | 4 +- percona/controller/utils_test.go | 2 +- percona/extensions/containers.go | 8 +- percona/k8s/testutils_test.go | 8 +- percona/k8s/util.go | 6 +- percona/k8s/util_test.go | 2 +- percona/naming/annotations.go | 26 ++-- percona/naming/label.go | 2 +- percona/naming/prefix.go | 4 +- percona/pgbackrest/pgbackrest.go | 6 +- percona/pmm/pmm.go | 4 +- percona/pmm/pmm_test.go | 4 +- percona/postgres/common.go | 6 +- percona/postgres/common_test.go | 6 +- percona/runtime/runtime.go | 6 +- percona/testutils/client.go | 24 ++-- .../client/api_version_proto_client.go | 2 +- .../version_service_apply_responses.go | 2 +- .../version_service_operator_responses.go | 2 +- .../version_service_product_responses.go | 2 +- percona/version/version.go | 12 +- percona/version/version_test.go | 12 +- percona/watcher/wal.go | 36 +++--- percona/watcher/wal_test.go | 120 +++++++++--------- .../v2/groupversion_info.go | 4 +- .../v2/perconapgbackup_types.go | 2 +- .../v2/perconapgbackup_types_test.go | 0 .../v2/perconapgcluster_types.go | 14 +- .../v2/perconapgcluster_types_test.go | 6 +- .../v2/perconapgrestore_types.go | 0 .../v2/perconapgupgrade_types.go | 4 +- .../v2/zz_generated.deepcopy.go | 2 +- .../v1beta1/crunchy_bridgecluster_types.go | 0 .../v1beta1/groupversion_info.go | 4 +- .../v1beta1/patroni_types.go | 0 .../v1beta1/pgadmin_types.go | 0 .../v1beta1/pgbackrest_types.go | 0 .../v1beta1/pgbackrest_types_test.go | 0 .../v1beta1/pgbouncer_types.go | 0 .../v1beta1/pgmonitor_types.go | 0 .../v1beta1/pgupgrade_types.go | 0 .../v1beta1/postgres_types.go | 0 .../v1beta1/postgrescluster_test.go | 4 +- .../v1beta1/postgrescluster_types.go | 4 +- .../v1beta1/shared_types.go | 0 .../v1beta1/shared_types_test.go | 0 .../v1beta1/standalone_pgadmin_types.go | 0 .../v1beta1/zz_generated.deepcopy.go | 0 692 files changed, 2362 insertions(+), 2362 deletions(-) rename build/crd/percona/generated/{pgv2.percona.com_perconapgbackups.yaml => pgv3.percona.com_perconapgbackups.yaml} (99%) rename build/crd/percona/generated/{pgv2.percona.com_perconapgclusters.yaml => pgv3.percona.com_perconapgclusters.yaml} (99%) rename build/crd/percona/generated/{pgv2.percona.com_perconapgrestores.yaml => pgv3.percona.com_perconapgrestores.yaml} (99%) rename build/crd/percona/generated/{pgv2.percona.com_perconapgupgrades.yaml => pgv3.percona.com_perconapgupgrades.yaml} (99%) rename config/crd/bases/{pgv2.percona.com_perconapgclusters.yaml => pgv3.percona.com_perconapgclusters.yaml} (99%) rename config/crd/bases/{upstream.pgv2.percona.com_crunchybridgeclusters.yaml => upstream.pgv3.percona.com_crunchybridgeclusters.yaml} (99%) rename config/crd/bases/{upstream.pgv2.percona.com_pgadmins.yaml => upstream.pgv3.percona.com_pgadmins.yaml} (99%) rename config/crd/bases/{upstream.pgv2.percona.com_pgupgrades.yaml => upstream.pgv3.percona.com_pgupgrades.yaml} (99%) rename config/crd/bases/{upstream.pgv2.percona.com_postgresclusters.yaml => upstream.pgv3.percona.com_postgresclusters.yaml} (99%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/groupversion_info.go (83%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/perconapgbackup_types.go (99%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/perconapgbackup_types_test.go (100%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/perconapgcluster_types.go (99%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/perconapgcluster_types_test.go (99%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/perconapgrestore_types.go (100%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/perconapgupgrade_types.go (97%) rename pkg/apis/{pgv2.percona.com => pgv3.percona.com}/v2/zz_generated.deepcopy.go (99%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/crunchy_bridgecluster_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/groupversion_info.go (87%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/patroni_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/pgadmin_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/pgbackrest_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/pgbackrest_types_test.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/pgbouncer_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/pgmonitor_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/pgupgrade_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/postgres_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/postgrescluster_test.go (98%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/postgrescluster_types.go (99%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/shared_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/shared_types_test.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/standalone_pgadmin_types.go (100%) rename pkg/apis/{upstream.pgv2.percona.com => upstream.pgv3.percona.com}/v1beta1/zz_generated.deepcopy.go (100%) 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 From f366bc3175852f4047e4ea8898eb48170a41dddb Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 13:46:07 +0500 Subject: [PATCH 02/38] revert ubi9 --- build/postgres-operator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile index 110df8036c..45c38b9745 100644 --- a/build/postgres-operator/Dockerfile +++ b/build/postgres-operator/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubi9 +ARG BASE_IMAGE=ubi10 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 || true +RUN microdnf update -y && microdnf clean all -y LABEL name="Percona Postgres Operator" \ vendor="Percona" \ From 3321e3fadd916f0ef7a483c7fe169f134d8ca289 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 14:01:14 +0500 Subject: [PATCH 03/38] linter --- cmd/extension-installer/main.go | 2 +- cmd/postgres-operator/open_telemetry.go | 3 ++- internal/bridge/client.go | 2 +- internal/bridge/client_test.go | 6 +++--- internal/controller/postgrescluster/volumes.go | 7 +++++++ percona/certmanager/certmanager_test.go | 7 ++++--- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/cmd/extension-installer/main.go b/cmd/extension-installer/main.go index ba5b724ae4..d4a42bc1ff 100644 --- a/cmd/extension-installer/main.go +++ b/cmd/extension-installer/main.go @@ -77,7 +77,7 @@ func initStorage(storageType extensions.StorageType, endpoint, bucket, region st case extensions.StorageTypeS3: return extensions.NewS3(endpoint, region, bucket, s3ForcePathStyle, disableSSL) default: - log.Fatalf("unknown storage type: %s", os.Getenv("STORAGE_TYPE")) + log.Fatalf("unknown storage type: %s", string(storageType)) } return nil diff --git a/cmd/postgres-operator/open_telemetry.go b/cmd/postgres-operator/open_telemetry.go index f8c9b7fc73..cc52a7a63a 100644 --- a/cmd/postgres-operator/open_telemetry.go +++ b/cmd/postgres-operator/open_telemetry.go @@ -9,6 +9,7 @@ import ( "io" "net/http" "os" + "path/filepath" "github.com/pkg/errors" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" @@ -35,7 +36,7 @@ func initOpenTelemetry() (func(), error) { options := []stdouttrace.Option{} if filename != "" { - file, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644) + file, err := os.OpenFile(filepath.Clean(filename), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644) if err != nil { return nil, errors.Wrap(err, "unable to open exporter file") } diff --git a/internal/bridge/client.go b/internal/bridge/client.go index 51100d432c..b4316f6e83 100644 --- a/internal/bridge/client.go +++ b/internal/bridge/client.go @@ -723,7 +723,7 @@ func (c *Client) UpdateCluster( ) (*ClusterApiResource, error) { result := &ClusterApiResource{} - clusterbyte, err := json.Marshal(clusterRequestPayload) + clusterbyte, err := json.Marshal(clusterRequestPayload) //nolint:errchkjson //in case the struct changes, we would need to check the error anyway if err != nil { return result, err } diff --git a/internal/bridge/client_test.go b/internal/bridge/client_test.go index 365192f09d..1c2010469b 100644 --- a/internal/bridge/client_test.go +++ b/internal/bridge/client_test.go @@ -1227,7 +1227,7 @@ func TestGetClusterRole(t *testing.T) { } t.Run("WeSendCorrectData", func(t *testing.T) { - responsePayloadJson, err := json.Marshal(clusterRoleApiResource) + responsePayloadJson, err := json.Marshal(clusterRoleApiResource) //nolint:gosec // test data, not a real secret assert.NilError(t, err) server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -1249,7 +1249,7 @@ func TestGetClusterRole(t *testing.T) { }) t.Run("OkResponse", func(t *testing.T) { - responsePayloadJson, err := json.Marshal(clusterRoleApiResource) + responsePayloadJson, err := json.Marshal(clusterRoleApiResource) //nolint:gosec // test data, not a real secret assert.NilError(t, err) server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -1267,7 +1267,7 @@ func TestGetClusterRole(t *testing.T) { }) t.Run("ErrorResponse", func(t *testing.T) { - responsePayloadJson, err := json.Marshal(clusterRoleApiResource) + responsePayloadJson, err := json.Marshal(clusterRoleApiResource) //nolint:gosec // test data, not a real secret assert.NilError(t, err) server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/internal/controller/postgrescluster/volumes.go b/internal/controller/postgrescluster/volumes.go index 318cb0a4fb..499c738344 100644 --- a/internal/controller/postgrescluster/volumes.go +++ b/internal/controller/postgrescluster/volumes.go @@ -128,6 +128,13 @@ func (r *Reconciler) observePersistentVolumeClaims( // - https://git.k8s.io/enhancements/keps/sig-storage/3751-volume-attributes-class corev1.PersistentVolumeClaimVolumeModifyingVolume, corev1.PersistentVolumeClaimVolumeModifyVolumeError: + + case + // These conditions are informational and do not require action + // from the operator. + corev1.PersistentVolumeClaimControllerResizeError, + corev1.PersistentVolumeClaimNodeResizeError, + corev1.PersistentVolumeClaimUnused: } } } diff --git a/percona/certmanager/certmanager_test.go b/percona/certmanager/certmanager_test.go index dcf4a289cd..46540c2f06 100644 --- a/percona/certmanager/certmanager_test.go +++ b/percona/certmanager/certmanager_test.go @@ -8,6 +8,7 @@ import ( v1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" "github.com/cert-manager/cert-manager/pkg/util/cmapichecker" + "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" @@ -95,7 +96,7 @@ func TestCheck(t *testing.T) { cl := setupFakeClient(t) ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { - return nil, fmt.Errorf("failed to create checker") + return nil, errors.Errorf("failed to create checker") } err := ctrl.Check(t.Context(), &rest.Config{}, "default") @@ -108,7 +109,7 @@ func TestCheck(t *testing.T) { ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { return &mockChecker{ - err: fmt.Errorf(`no matches for kind "CertificateRequest" in group "cert-manager.io"`), + err: errors.Errorf(`no matches for kind "CertificateRequest" in group "cert-manager.io"`), }, nil } @@ -121,7 +122,7 @@ func TestCheck(t *testing.T) { ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { return &mockChecker{ - err: fmt.Errorf("error finding the scope of the object: failed to get restmapping: unable to retrieve the complete list of server APIs: cert-manager.io/v1: no matches for cert-manager.io/v1, Resource="), + err: errors.Errorf("error finding the scope of the object: failed to get restmapping: unable to retrieve the complete list of server APIs: cert-manager.io/v1: no matches for cert-manager.io/v1, Resource="), }, nil } From 33fa9d3efc3e623fdba876cc1c2ad662e5cb15cf Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 14:14:25 +0500 Subject: [PATCH 04/38] linter --- cmd/pgbackrest/main.go | 4 ++++ internal/bridge/crunchybridgecluster/postgres_test.go | 4 ++-- internal/controller/postgrescluster/instance.go | 4 ++++ internal/controller/postgrescluster/pki.go | 3 +++ internal/patroni/config.go | 2 +- internal/pgmonitor/api.go | 2 +- internal/pki/pki_test.go | 4 ++-- internal/postgres/parameters_test.go | 2 +- internal/postgres/password/scram_test.go | 2 +- internal/util/secrets_test.go | 4 ++-- percona/certmanager/certmanager_test.go | 6 +++--- 11 files changed, 24 insertions(+), 13 deletions(-) diff --git a/cmd/pgbackrest/main.go b/cmd/pgbackrest/main.go index bda9fc29bf..29e0c6b54c 100644 --- a/cmd/pgbackrest/main.go +++ b/cmd/pgbackrest/main.go @@ -142,6 +142,10 @@ func (k *KubeAPI) Exec(ctx context.Context, namespace, pod, container string, st }, ParameterCodec) exec, err := remotecommand.NewSPDYExecutor(k.Config, "POST", request.URL()) + if err != nil { + log.Error(err) + return err + } stdoutReader, stdoutWriter := io.Pipe() defer func() { diff --git a/internal/bridge/crunchybridgecluster/postgres_test.go b/internal/bridge/crunchybridgecluster/postgres_test.go index 8ae3bd2b3d..de41a948b6 100644 --- a/internal/bridge/crunchybridgecluster/postgres_test.go +++ b/internal/bridge/crunchybridgecluster/postgres_test.go @@ -36,7 +36,7 @@ func TestGeneratePostgresRoleSecret(t *testing.T) { Name: "application", SecretName: "application-role-secret", } - role := &bridge.ClusterRoleApiResource{ + role := &bridge.ClusterRoleApiResource{ //nolint:gosec //test data Name: "application", Password: "password", URI: "postgres://application:password@example.com:5432/postgres", @@ -149,7 +149,7 @@ func TestReconcilePostgresRoleSecrets(t *testing.T) { Name: "application", SecretName: "application-role-secret", } - postgresSpec := &v1beta1.CrunchyBridgeClusterRoleSpec{ + postgresSpec := &v1beta1.CrunchyBridgeClusterRoleSpec{ //nolint:gosec //test data Name: "postgres", SecretName: "postgres-role-secret", } diff --git a/internal/controller/postgrescluster/instance.go b/internal/controller/postgrescluster/instance.go index cb9fd84df7..b2d0f25217 100644 --- a/internal/controller/postgrescluster/instance.go +++ b/internal/controller/postgrescluster/instance.go @@ -1215,6 +1215,10 @@ func (r *Reconciler) reconcileInstance( err = patroni.InstancePod( ctx, cluster, clusterConfigMap, clusterPodService, patroniLeaderService, spec, instanceCertificates, instanceConfigMap, &instance.Spec.Template, initImage) // K8SPG-708 + if err != nil { + return errors.Wrap(err, "failed to populate pod") + } + } // Add pgMonitor resources to the instance Pod spec diff --git a/internal/controller/postgrescluster/pki.go b/internal/controller/postgrescluster/pki.go index 5b9e97f832..2a4fff051f 100644 --- a/internal/controller/postgrescluster/pki.go +++ b/internal/controller/postgrescluster/pki.go @@ -255,6 +255,9 @@ func (r *Reconciler) reconcileInternalClusterCertificate( existing := &corev1.Secret{ObjectMeta: naming.PostgresTLSSecret(cluster)} err := errors.WithStack(client.IgnoreNotFound( r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing))) + if err != nil { + return nil, errors.Wrap(err, "get secret") + } leaf := &pki.LeafCertificate{} primaryServiceDNSNames, err := naming.ServiceDNSNames(ctx, primaryService, cluster.Spec.ClusterServiceDNSSuffix) diff --git a/internal/patroni/config.go b/internal/patroni/config.go index 44d0c61cdd..1315c2479e 100644 --- a/internal/patroni/config.go +++ b/internal/patroni/config.go @@ -521,7 +521,7 @@ func instanceYAML( }, } - postgresql := map[string]any{ + postgresql := map[string]any{ //nolint:gosec //TODO: investigate the security concern // TODO(cbandy): "bin_dir" // Missing here is "connect_address" which cannot be known until the diff --git a/internal/pgmonitor/api.go b/internal/pgmonitor/api.go index b377455142..9469e76530 100644 --- a/internal/pgmonitor/api.go +++ b/internal/pgmonitor/api.go @@ -52,7 +52,7 @@ func (exec Executor) GetExporterSetupSQL(ctx context.Context, version int) (stri "/opt/crunchy/bin/postgres/pgbackrest_info.sh") } - log.V(1).Info("updated pgMonitor default configration", "sql", sql) + log.V(1).Info("updated pgMonitor default configuration", "sql", sql) return sql, stderr.String(), err } diff --git a/internal/pki/pki_test.go b/internal/pki/pki_test.go index 27cf0c35ad..287f568667 100644 --- a/internal/pki/pki_test.go +++ b/internal/pki/pki_test.go @@ -194,7 +194,7 @@ func TestRootIsInvalid(t *testing.T) { t.Cleanup(func() { currentTime = original }) currentTime = func() time.Time { - return time.Date(2010, time.January, 1, 0, 0, 0, 0, time.Local) + return time.Date(2010, time.January, 1, 0, 0, 0, 0, time.Local) //nolint:gosmopolitan //test data } root, err := NewRootCertificateAuthority() @@ -395,7 +395,7 @@ func TestLeafIsInvalid(t *testing.T) { t.Cleanup(func() { currentTime = original }) currentTime = func() time.Time { - return time.Date(2010, time.January, 1, 0, 0, 0, 0, time.Local) + return time.Date(2010, time.January, 1, 0, 0, 0, 0, time.Local) //nolint:gosmopolitan //test data } leaf, err := root.GenerateLeafCertificate("", nil) diff --git a/internal/postgres/parameters_test.go b/internal/postgres/parameters_test.go index 64538cbc12..a25e3c2ea2 100644 --- a/internal/postgres/parameters_test.go +++ b/internal/postgres/parameters_test.go @@ -21,7 +21,7 @@ func TestNewParameters(t *testing.T) { "unix_socket_directories": "/tmp/postgres", }) - assert.DeepEqual(t, parameters.Default.AsMap(), map[string]string{ + assert.DeepEqual(t, parameters.Default.AsMap(), map[string]string{ //nolint:gosec //test data "jit": "off", "password_encryption": "scram-sha-256", diff --git a/internal/postgres/password/scram_test.go b/internal/postgres/password/scram_test.go index 0552e519b7..17b61d289f 100644 --- a/internal/postgres/password/scram_test.go +++ b/internal/postgres/password/scram_test.go @@ -190,7 +190,7 @@ func TestSCRAMSASLPrep(t *testing.T) { tests := []stringStruct{ {password: "hippo", expected: "hippo"}, {password: "híppo", expected: "híppo"}, - {password: "こんにちは", expected: "こんにちは"}, + {password: "こんにちは", expected: "こんにちは"}, //nolint:gosec // test data {password: "hippo\u1680lake", expected: "hippo lake"}, {password: "hipp\ufe01o", expected: "hippo"}, {password: "hipp\u206ao", expected: "hipp\u206ao"}, diff --git a/internal/util/secrets_test.go b/internal/util/secrets_test.go index 187852bf5c..1831433621 100644 --- a/internal/util/secrets_test.go +++ b/internal/util/secrets_test.go @@ -20,7 +20,7 @@ func TestAccumulate(t *testing.T) { called := 0 result, err := accumulate(10, func() (byte, error) { called++ - return byte('A' + called), nil + return byte('A' + called), nil //nolint:gosec //test data }) assert.NilError(t, err) @@ -33,7 +33,7 @@ func TestAccumulate(t *testing.T) { result, err := accumulate(10, func() (byte, error) { called++ if called < 5 { - return byte('A' + called), nil + return byte('A' + called), nil //nolint:gosec //test data } else { return 'Z', expected } diff --git a/percona/certmanager/certmanager_test.go b/percona/certmanager/certmanager_test.go index 46540c2f06..d82194f1e3 100644 --- a/percona/certmanager/certmanager_test.go +++ b/percona/certmanager/certmanager_test.go @@ -135,7 +135,7 @@ func TestCheck(t *testing.T) { ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { return &mockChecker{ - err: fmt.Errorf(`Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": service "cert-manager-webhook" not found`), + err: errors.Errorf(`Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": service "cert-manager-webhook" not found`), }, nil } @@ -148,7 +148,7 @@ func TestCheck(t *testing.T) { ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { return &mockChecker{ - err: fmt.Errorf(`Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": dial tcp 10.96.38.90:443: connect: connection refused`), + err: errors.Errorf(`Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": dial tcp 10.96.38.90:443: connect: connection refused`), }, nil } @@ -161,7 +161,7 @@ func TestCheck(t *testing.T) { ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { return &mockChecker{ - err: fmt.Errorf(`Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": x509: certificate signed by unknown authority`), + err: errors.Errorf(`Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": x509: certificate signed by unknown authority`), }, nil } From d053f7a90518c612578d5fd86e246319ab356b31 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 14:41:08 +0500 Subject: [PATCH 05/38] linter --- internal/bridge/client_test.go | 6 +- .../bridge/crunchybridgecluster/delete.go | 2 +- .../controller/postgrescluster/pgbackrest.go | 2 +- internal/controller/postgrescluster/pki.go | 2 +- internal/controller/postgrescluster/util.go | 2 - internal/controller/runtime/reconcile_test.go | 5 +- .../controller/standalone_pgadmin/apply.go | 2 +- .../standalone_pgadmin/configmap_test.go | 4 +- .../standalone_pgadmin/controller.go | 4 +- internal/controller/standalone_pgadmin/pod.go | 2 +- .../controller/standalone_pgadmin/users.go | 2 +- .../controller/standalone_pgadmin/watches.go | 2 +- internal/pgbackrest/config_test.go | 2 +- internal/pgbackrest/reconcile.go | 3 +- internal/pgbackrest/reconcile_test.go | 2 +- internal/pgbouncer/config_test.go | 2 +- internal/upgradecheck/helpers_test.go | 4 +- percona/certmanager/certmanager.go | 2 +- percona/controller/pgcluster/backup_test.go | 13 ---- percona/controller/pgcluster/controller.go | 78 ------------------- .../controller/pgcluster/controller_test.go | 2 +- percona/controller/pgcluster/finalizer.go | 2 - percona/controller/pgcluster/secret.go | 2 +- .../controller/pgcluster/testutils_test.go | 17 ---- .../pgv3.percona.com/v2/groupversion_info.go | 2 +- .../v2/perconapgbackup_types.go | 4 +- .../v2/perconapgcluster_types.go | 6 +- .../v1beta1/groupversion_info.go | 2 +- .../v1beta1/postgrescluster_test.go | 2 +- .../v1beta1/shared_types.go | 4 +- 30 files changed, 35 insertions(+), 149 deletions(-) diff --git a/internal/bridge/client_test.go b/internal/bridge/client_test.go index 1c2010469b..a9cd66ada2 100644 --- a/internal/bridge/client_test.go +++ b/internal/bridge/client_test.go @@ -29,8 +29,8 @@ func TestClientBackoff(t *testing.T) { client := NewClient("", "") var total time.Duration - for i := 1; i <= 50 && client.Backoff.Steps > 0; i++ { - step := client.Backoff.Step() + for i := 1; i <= 50 && client.Backoff.Steps > 0; i++ { //nolint:staticcheck //test data + step := client.Backoff.Step() //nolint:staticcheck //test data total += step t.Logf("%02d:%20v%20v", i, step, total) @@ -66,7 +66,7 @@ func TestClientDoWithBackoff(t *testing.T) { // Client with one attempt, i.e. no backoff. client := NewClient(server.URL, "xyz") - client.Backoff.Steps = 1 + client.Backoff.Steps = 1 //nolint:staticcheck //test data assert.Equal(t, client.BaseURL.String(), server.URL) ctx := context.Background() diff --git a/internal/bridge/crunchybridgecluster/delete.go b/internal/bridge/crunchybridgecluster/delete.go index 82a5f518e8..710d9b0195 100644 --- a/internal/bridge/crunchybridgecluster/delete.go +++ b/internal/bridge/crunchybridgecluster/delete.go @@ -27,7 +27,7 @@ func (r *CrunchyBridgeClusterReconciler) handleDelete( log := ctrl.LoggerFrom(ctx) // If the CrunchyBridgeCluster isn't being deleted, add the finalizer - if crunchybridgecluster.ObjectMeta.DeletionTimestamp.IsZero() { + if crunchybridgecluster.ObjectMeta.DeletionTimestamp.IsZero() { //nolint:staticcheck //test data if !controllerutil.ContainsFinalizer(crunchybridgecluster, finalizer) { controllerutil.AddFinalizer(crunchybridgecluster, finalizer) if err := r.Update(ctx, crunchybridgecluster); err != nil { diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index cef7c4dc92..9d50a408ee 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -783,7 +783,7 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster func (r *Reconciler) generateRepoVolumeIntent(postgresCluster *v1beta1.PostgresCluster, spec corev1.PersistentVolumeClaimSpec, repoName string, repoResources *RepoResources, -) (*corev1.PersistentVolumeClaim, error) { +) (*corev1.PersistentVolumeClaim, error) { //nolint:unparam annotations := naming.Merge( postgresCluster.Spec.Metadata.GetAnnotationsOrNil(), postgresCluster.Spec.Backups.PGBackRest.Metadata.GetAnnotationsOrNil()) diff --git a/internal/controller/postgrescluster/pki.go b/internal/controller/postgrescluster/pki.go index 2a4fff051f..79041fddcd 100644 --- a/internal/controller/postgrescluster/pki.go +++ b/internal/controller/postgrescluster/pki.go @@ -330,7 +330,7 @@ func (r *Reconciler) reconcileInternalClusterCertificate( // reconcileCertManagerClusterCertificate creates a cluster certificate using cert-manager. // It first ensures the TLS issuer exists, then creates the cluster Certificate CR. func (r *Reconciler) reconcileCertManagerClusterCertificate( - ctx context.Context, root *pki.RootCertificateAuthority, + ctx context.Context, _ *pki.RootCertificateAuthority, cluster *v1beta1.PostgresCluster, primaryService *corev1.Service, replicaService *corev1.Service, ) ( diff --git a/internal/controller/postgrescluster/util.go b/internal/controller/postgrescluster/util.go index 37a72b3cce..0cb7dd673f 100644 --- a/internal/controller/postgrescluster/util.go +++ b/internal/controller/postgrescluster/util.go @@ -20,8 +20,6 @@ import ( "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" ) -var tmpDirSizeLimit = resource.MustParse("16Mi") - const ( // devSHMDir is the directory used for allocating shared memory segments, // which are needed by Postgres diff --git a/internal/controller/runtime/reconcile_test.go b/internal/controller/runtime/reconcile_test.go index 0515a4bc35..3fcf3b1257 100644 --- a/internal/controller/runtime/reconcile_test.go +++ b/internal/controller/runtime/reconcile_test.go @@ -38,20 +38,17 @@ func TestErrorWithoutBackoff(t *testing.T) { func TestRequeueWithBackoff(t *testing.T) { result := RequeueWithBackoff() - assert.Assert(t, result.Requeue) + assert.Assert(t, !result.IsZero()) assert.Assert(t, result.RequeueAfter == 0) } func TestRequeueWithoutBackoff(t *testing.T) { result := RequeueWithoutBackoff(0) - assert.Assert(t, result.Requeue) assert.Assert(t, result.RequeueAfter > 0) result = RequeueWithoutBackoff(-1) - assert.Assert(t, result.Requeue) assert.Assert(t, result.RequeueAfter > 0) result = RequeueWithoutBackoff(time.Minute) - assert.Assert(t, result.Requeue) assert.Equal(t, result.RequeueAfter, time.Minute) } diff --git a/internal/controller/standalone_pgadmin/apply.go b/internal/controller/standalone_pgadmin/apply.go index 0eaa613df8..fc6d3ffb3d 100644 --- a/internal/controller/standalone_pgadmin/apply.go +++ b/internal/controller/standalone_pgadmin/apply.go @@ -22,7 +22,7 @@ func (r *PGAdminReconciler) patch( patch client.Patch, options ...client.PatchOption, ) error { options = append([]client.PatchOption{r.Owner}, options...) - return r.Client.Patch(ctx, object, patch, options...) + return r.Patch(ctx, object, patch, options...) } // apply sends an apply patch to object's endpoint in the Kubernetes API and diff --git a/internal/controller/standalone_pgadmin/configmap_test.go b/internal/controller/standalone_pgadmin/configmap_test.go index 92d97865f4..df621e19cb 100644 --- a/internal/controller/standalone_pgadmin/configmap_test.go +++ b/internal/controller/standalone_pgadmin/configmap_test.go @@ -196,12 +196,12 @@ namespace: some-ns assert.NilError(t, err) // Annotations present in the metadata. - assert.DeepEqual(t, configmap.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, configmap.Annotations, map[string]string{ "a": "v1", "b": "v2", }) // Labels present in the metadata. - assert.DeepEqual(t, configmap.ObjectMeta.Labels, map[string]string{ + assert.DeepEqual(t, configmap.Labels, map[string]string{ "c": "v3", "d": "v4", "postgres-operator.crunchydata.com/pgadmin": "pg1", "postgres-operator.crunchydata.com/role": "pgadmin", diff --git a/internal/controller/standalone_pgadmin/controller.go b/internal/controller/standalone_pgadmin/controller.go index aee0b6319e..b54edb832a 100644 --- a/internal/controller/standalone_pgadmin/controller.go +++ b/internal/controller/standalone_pgadmin/controller.go @@ -158,7 +158,7 @@ func (r *PGAdminReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct func (r *PGAdminReconciler) setControllerReference( owner *v1beta1.PGAdmin, controlled client.Object, ) error { - return controllerutil.SetControllerReference(owner, controlled, r.Client.Scheme()) + return controllerutil.SetControllerReference(owner, controlled, r.Scheme()) } // deleteControlled safely deletes object when it is controlled by pgAdmin. @@ -170,7 +170,7 @@ func (r *PGAdminReconciler) deleteControlled( version := object.GetResourceVersion() exactly := client.Preconditions{UID: &uid, ResourceVersion: &version} - return r.Client.Delete(ctx, object, exactly) + return r.Delete(ctx, object, exactly) } return nil diff --git a/internal/controller/standalone_pgadmin/pod.go b/internal/controller/standalone_pgadmin/pod.go index 54a36fd7c7..7425d7c264 100644 --- a/internal/controller/standalone_pgadmin/pod.go +++ b/internal/controller/standalone_pgadmin/pod.go @@ -170,7 +170,7 @@ func pod( // Check the configmap to see if we think TLS is enabled // If so, update the readiness check scheme to HTTPS if strings.Contains(gunicornData, "certfile") && strings.Contains(gunicornData, "keyfile") { - readinessProbe.ProbeHandler.HTTPGet.Scheme = corev1.URISchemeHTTPS + readinessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS } container.ReadinessProbe = readinessProbe diff --git a/internal/controller/standalone_pgadmin/users.go b/internal/controller/standalone_pgadmin/users.go index 8bb0e75f21..29ea326075 100644 --- a/internal/controller/standalone_pgadmin/users.go +++ b/internal/controller/standalone_pgadmin/users.go @@ -183,7 +183,7 @@ cd $PGADMIN_DIR // Get password from secret userPasswordSecret := &corev1.Secret{ObjectMeta: metav1.ObjectMeta{ Namespace: pgadmin.Namespace, - Name: user.PasswordRef.LocalObjectReference.Name, + Name: user.PasswordRef.Name, }} err := errors.WithStack( r.Client.Get(ctx, client.ObjectKeyFromObject(userPasswordSecret), userPasswordSecret)) diff --git a/internal/controller/standalone_pgadmin/watches.go b/internal/controller/standalone_pgadmin/watches.go index d8de059b2f..1b178786fb 100644 --- a/internal/controller/standalone_pgadmin/watches.go +++ b/internal/controller/standalone_pgadmin/watches.go @@ -92,7 +92,7 @@ func (r *PGAdminReconciler) findPGAdminsForSecret( }); err == nil { for i := range pgadmins.Items { for j := range pgadmins.Items[i].Spec.Users { - if pgadmins.Items[i].Spec.Users[j].PasswordRef.LocalObjectReference.Name == secret.Name { + if pgadmins.Items[i].Spec.Users[j].PasswordRef.Name == secret.Name { matching = append(matching, &pgadmins.Items[i]) break } diff --git a/internal/pgbackrest/config_test.go b/internal/pgbackrest/config_test.go index c058c7c680..c0643edffd 100644 --- a/internal/pgbackrest/config_test.go +++ b/internal/pgbackrest/config_test.go @@ -322,7 +322,7 @@ func TestReloadCommand(t *testing.T) { assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.Command(shellcheck, "--enable=all", file) //nolint:noctx //test data output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/pgbackrest/reconcile.go b/internal/pgbackrest/reconcile.go index 504f898df9..576e284954 100644 --- a/internal/pgbackrest/reconcile.go +++ b/internal/pgbackrest/reconcile.go @@ -550,7 +550,8 @@ func Secret(ctx context.Context, // The client verifies the "pg-host" or "repo-host" option it used is // present in the DNS names of the server certificate. leaf := &pki.LeafCertificate{} - dnsNames, err := naming.RepoHostPodDNSNames(ctx, inRepoHost, inCluster.Spec.ClusterServiceDNSSuffix) + var dnsNames []string + dnsNames, err = naming.RepoHostPodDNSNames(ctx, inRepoHost, inCluster.Spec.ClusterServiceDNSSuffix) if err != nil { return errors.Wrap(err, "failed to resolve repo host pod DNS names") } diff --git a/internal/pgbackrest/reconcile_test.go b/internal/pgbackrest/reconcile_test.go index cb7f87d5f2..9f72b639ca 100644 --- a/internal/pgbackrest/reconcile_test.go +++ b/internal/pgbackrest/reconcile_test.go @@ -128,7 +128,7 @@ func TestAddRepoVolumesToPod(t *testing.T) { for _, r := range tc.repos { var foundVolume bool for _, v := range template.Spec.Volumes { - if v.Name == r.Name && v.VolumeSource.PersistentVolumeClaim.ClaimName == + if v.Name == r.Name && v.PersistentVolumeClaim.ClaimName == naming.PGBackRestRepoVolume(postgresCluster, r.Name).Name { foundVolume = true break diff --git a/internal/pgbouncer/config_test.go b/internal/pgbouncer/config_test.go index 641f1b5083..42c93bc6fd 100644 --- a/internal/pgbouncer/config_test.go +++ b/internal/pgbouncer/config_test.go @@ -351,7 +351,7 @@ func TestReloadCommand(t *testing.T) { assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.Command(shellcheck, "--enable=all", file) //nolint:noctx //test data output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/upgradecheck/helpers_test.go b/internal/upgradecheck/helpers_test.go index 0b6eff291e..a86e54377c 100644 --- a/internal/upgradecheck/helpers_test.go +++ b/internal/upgradecheck/helpers_test.go @@ -47,8 +47,8 @@ func (f *fakeClientWithError) Get(ctx context.Context, key types.NamespacedName, func (f *fakeClientWithError) Patch(ctx context.Context, obj crclient.Object, patch crclient.Patch, opts ...crclient.PatchOption, ) error { - switch { - case f.errorType == "patch error": + switch f.errorType { + case "patch error": return errors.New("patch error") default: return f.Client.Patch(ctx, obj, patch, opts...) diff --git a/percona/certmanager/certmanager.go b/percona/certmanager/certmanager.go index a3f108d495..4c856fed64 100644 --- a/percona/certmanager/certmanager.go +++ b/percona/certmanager/certmanager.go @@ -368,7 +368,7 @@ func (c *controller) ApplyClusterCertificate(ctx context.Context, cluster *v1bet SecretName: certName, CommonName: cluster.Name + "-postgres", DNSNames: dnsNames, - IssuerRef: cmmeta.ObjectReference{ + IssuerRef: cmmeta.IssuerReference{ Name: naming.TLSIssuer(cluster).Name, Kind: v1.IssuerKind, }, diff --git a/percona/controller/pgcluster/backup_test.go b/percona/controller/pgcluster/backup_test.go index c6a54fbdc1..21ce1faeec 100644 --- a/percona/controller/pgcluster/backup_test.go +++ b/percona/controller/pgcluster/backup_test.go @@ -23,19 +23,6 @@ import ( "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 { - if len(x) != len(y) { - return false - } - - for k, v := range x { - if y[k] != v { - return false - } - } - return true -} - func TestBackupOwnerReference(t *testing.T) { // The test is disabled, because there are problems with the fake client // diff --git a/percona/controller/pgcluster/controller.go b/percona/controller/pgcluster/controller.go index 76a3d38d0c..2e554720c9 100644 --- a/percona/controller/pgcluster/controller.go +++ b/percona/controller/pgcluster/controller.go @@ -401,9 +401,6 @@ func (r *PGClusterReconciler) reconcileTLS(ctx context.Context, cr *v2.PerconaPG if err := r.validateTLS(ctx, cr); err != nil { return errors.Wrap(err, "validate TLS") } - if err := r.reconcileOldCACert(ctx, cr); err != nil { - return errors.Wrap(err, "reconcile old CA") - } return nil } @@ -459,81 +456,6 @@ func (r *PGClusterReconciler) validateTLS(ctx context.Context, cr *v2.PerconaPGC return nil } -func (r *PGClusterReconciler) reconcileOldCACert(ctx context.Context, cr *v2.PerconaPGCluster) error { - if cr.Spec.Secrets.CustomRootCATLSSecret != nil { - return nil - } - - oldCASecret := &corev1.Secret{ - ObjectMeta: metav1.ObjectMeta{ - Name: naming.RootCertSecret, - Namespace: cr.Namespace, - }, - } - err := r.Client.Get(ctx, client.ObjectKeyFromObject(oldCASecret), oldCASecret) - if client.IgnoreNotFound(err) != nil { - return errors.Wrap(err, "failed to get old ca secret") - } - - if cr.CompareVersion("2.5.0") < 0 { - if k8serrors.IsNotFound(err) { - // K8SPG-555: We should create an empty secret with old name, so that crunchy part can populate it - // instead of creating secrets unique to the cluster - // TODO: remove when 2.4.0 will become unsupported - - if err := r.Client.Create(ctx, oldCASecret); err != nil { - return errors.Wrap(err, "failed to create ca secret") - } - } - return nil - } - if k8serrors.IsNotFound(err) { - return nil - } - - // K8SPG-555: Previously we used a single CA secret for all clusters in a namespace. - // We should copy the contents of the old CA secret, if it exists, to the new one, which is unique for each cluster. - // TODO: remove when 2.4.0 will become unsupported - newCASecret := &corev1.Secret{ - ObjectMeta: naming.PostgresRootCASecret( - &v1beta1.PostgresCluster{ - ObjectMeta: metav1.ObjectMeta{ - Name: cr.Name, - Namespace: cr.Namespace, - }, - }), - } - err = r.Client.Get(ctx, client.ObjectKeyFromObject(newCASecret), new(corev1.Secret)) - if client.IgnoreNotFound(err) != nil { - return errors.Wrap(err, "failed to get new ca secret") - } - - if k8serrors.IsNotFound(err) { - err := r.Client.Get(ctx, types.NamespacedName{ - Name: cr.Name, - Namespace: cr.Namespace, - }, new(v1beta1.PostgresCluster)) - if client.IgnoreNotFound(err) != nil { - return errors.Wrap(err, "failed to get crunchy cluster") - } - // If the cluster is new, we should not copy the old CA secret. - // We should create an empty secret instead, so that crunchy part can populate it. - if !k8serrors.IsNotFound(err) { - newCASecret.Data = oldCASecret.Data - } - - if cr.CompareVersion("2.6.0") >= 0 && cr.Spec.Metadata != nil { - newCASecret.Annotations = cr.Spec.Metadata.Annotations - newCASecret.Labels = cr.Spec.Metadata.Labels - } - - if err := r.Client.Create(ctx, newCASecret); err != nil { - return errors.Wrap(err, "failed to create updated CA secret") - } - } - return nil -} - func (r *PGClusterReconciler) reconcilePMM(ctx context.Context, cr *v2.PerconaPGCluster) error { if !cr.PMMEnabled() { return nil diff --git a/percona/controller/pgcluster/controller_test.go b/percona/controller/pgcluster/controller_test.go index e3c255b586..251b856f1b 100644 --- a/percona/controller/pgcluster/controller_test.go +++ b/percona/controller/pgcluster/controller_test.go @@ -483,7 +483,7 @@ var _ = Describe("Monitor user password change", Ordered, func() { }) // tracerWithCounter is a tracer that counts the number of times the Reconcile is called. It should be used for crunchy reconciler. -type tracerWithCounter struct { +type tracerWithCounter struct { //nolint:unused noop.Tracer counter int t trace.Tracer diff --git a/percona/controller/pgcluster/finalizer.go b/percona/controller/pgcluster/finalizer.go index fe24b9d2e5..3497ee764c 100644 --- a/percona/controller/pgcluster/finalizer.go +++ b/percona/controller/pgcluster/finalizer.go @@ -20,8 +20,6 @@ import ( v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) -type finalizerFunc func(context.Context, *v2.PerconaPGCluster) error - func (r *PGClusterReconciler) deletePVC(ctx context.Context, cr *v2.PerconaPGCluster) error { log := logging.FromContext(ctx) diff --git a/percona/controller/pgcluster/secret.go b/percona/controller/pgcluster/secret.go index dd748b77ac..f77dc60619 100644 --- a/percona/controller/pgcluster/secret.go +++ b/percona/controller/pgcluster/secret.go @@ -32,7 +32,7 @@ func getSecretHash(secrets ...corev1.Secret) string { var data strings.Builder for _, secret := range secrets { - data.WriteString(fmt.Sprintln(secret.Data)) + fmt.Fprintln(&data, secret.Data) } return fmt.Sprintf("%x", md5.Sum([]byte(data.String()))) //nolint:gosec diff --git a/percona/controller/pgcluster/testutils_test.go b/percona/controller/pgcluster/testutils_test.go index d6c9bf10b4..8bdf15e274 100644 --- a/percona/controller/pgcluster/testutils_test.go +++ b/percona/controller/pgcluster/testutils_test.go @@ -150,23 +150,6 @@ func readDefaultOperator(name, namespace string) (*appsv1.Deployment, error) { return cr, nil } -func readDefaultBackup(name, namespace string) (*v2.PerconaPGBackup, error) { - data, err := os.ReadFile(filepath.Join("..", "..", "..", "deploy", "backup.yaml")) - if err != nil { - return nil, err - } - - bcp := &v2.PerconaPGBackup{} - - if err := yaml.Unmarshal(data, bcp); err != nil { - return nil, err - } - - bcp.Name = name - bcp.Namespace = namespace - return bcp, nil -} - type fakeClient struct { client.Client } diff --git a/pkg/apis/pgv3.percona.com/v2/groupversion_info.go b/pkg/apis/pgv3.percona.com/v2/groupversion_info.go index 2acb586729..cfed8a5f8b 100644 --- a/pkg/apis/pgv3.percona.com/v2/groupversion_info.go +++ b/pkg/apis/pgv3.percona.com/v2/groupversion_info.go @@ -12,7 +12,7 @@ var ( 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} + SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} //nolint:staticcheck // AddToScheme adds the types in this group-version to the given scheme. AddToScheme = SchemeBuilder.AddToScheme diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go b/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go index dd6604ee25..6bbf9da722 100644 --- a/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go +++ b/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go @@ -140,7 +140,7 @@ type SnapshotStatus struct { } // +kubebuilder:validation:Type=string -type PITRestoreDateTime struct { +type PITRestoreDateTime struct { //nolint:recvcheck *metav1.Time `json:",inline"` } @@ -184,7 +184,7 @@ func (t PITRestoreDateTime) MarshalJSON() ([]byte, error) { return []byte("null"), nil } - return json.Marshal(t.Time.Format("2006-01-02 15:04:05.000000-0700")) + return json.Marshal(t.Format("2006-01-02 15:04:05.000000-0700")) } type PGBackupStorageType string diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go index 09e36e2046..afd18d1664 100644 --- a/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go @@ -43,7 +43,7 @@ func init() { // +operator-sdk:csv:customresourcedefinitions:resources={{ConfigMap,v1},{Secret,v1},{Service,v1},{CronJob,v1beta1},{Deployment,v1},{Job,v1},{StatefulSet,v1},{PersistentVolumeClaim,v1}} // // PerconaPGCluster is the CRD that defines a Percona PG Cluster -type PerconaPGCluster struct { +type PerconaPGCluster struct { //nolint:recvcheck metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` @@ -636,7 +636,7 @@ type Patroni struct { // Backups struct. // +kubebuilder:validation:XValidation:rule="(has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos) && size(self.pgbackrest.repos) > 0)",message="At least one repository must be configured when backups are enabled" -type Backups struct { +type Backups struct { //nolint:recvcheck Enabled *bool `json:"enabled,omitempty"` // pgBackRest archive configuration @@ -963,7 +963,7 @@ func (p PGInstanceSets) ToCrunchy() []crunchyv1beta1.PostgresInstanceSetSpec { return set } -type PGInstanceSetSpec struct { +type PGInstanceSetSpec struct { //nolint:recvcheck // +optional Metadata *crunchyv1beta1.Metadata `json:"metadata,omitempty"` diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go index 893b58ae3a..a214ef0679 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go @@ -17,7 +17,7 @@ var ( 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} + SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} //nolint:staticcheck // AddToScheme adds the types in this group-version to the given scheme. AddToScheme = SchemeBuilder.AddToScheme diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go index ee70244119..31a4988edf 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go @@ -16,7 +16,7 @@ import ( ) func TestPostgresClusterWebhooks(t *testing.T) { - var _ webhook.CustomDefaulter = &PostgresCluster{} + var _ webhook.CustomDefaulter = &PostgresCluster{} //nolint:staticcheck } func TestPostgresClusterDefault(t *testing.T) { diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go index 9176596d15..5167ce3774 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go @@ -57,13 +57,13 @@ type ServiceSpec struct { // // +optional // +kubebuilder:validation:Enum={Cluster,Local} - InternalTrafficPolicy *corev1.ServiceInternalTrafficPolicyType `json:"internalTrafficPolicy,omitempty"` + InternalTrafficPolicy *corev1.ServiceExternalTrafficPolicy `json:"internalTrafficPolicy,omitempty"` // More info: https://kubernetes.io/docs/concepts/services-networking/service/#traffic-policies // // +optional // +kubebuilder:validation:Enum={Cluster,Local} - ExternalTrafficPolicy *corev1.ServiceExternalTrafficPolicyType `json:"externalTrafficPolicy,omitempty"` + ExternalTrafficPolicy *corev1.ServiceExternalTrafficPolicy `json:"externalTrafficPolicy,omitempty"` } // Sidecar defines the configuration of a sidecar container From 7494bf2ff1162a1cee4ea6fbd47f8252a9214dd9 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 14:55:37 +0500 Subject: [PATCH 06/38] linter --- pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go | 2 +- .../v1beta1/zz_generated.deepcopy.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go index 5167ce3774..99db9cca72 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go @@ -57,7 +57,7 @@ type ServiceSpec struct { // // +optional // +kubebuilder:validation:Enum={Cluster,Local} - InternalTrafficPolicy *corev1.ServiceExternalTrafficPolicy `json:"internalTrafficPolicy,omitempty"` + InternalTrafficPolicy *corev1.ServiceInternalTrafficPolicy `json:"internalTrafficPolicy,omitempty"` // More info: https://kubernetes.io/docs/concepts/services-networking/service/#traffic-policies // diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go b/pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go index b3f88c9297..416671a545 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go @@ -2560,12 +2560,12 @@ func (in *ServiceSpec) DeepCopyInto(out *ServiceSpec) { } if in.InternalTrafficPolicy != nil { in, out := &in.InternalTrafficPolicy, &out.InternalTrafficPolicy - *out = new(corev1.ServiceInternalTrafficPolicyType) + *out = new(corev1.ServiceInternalTrafficPolicy) **out = **in } if in.ExternalTrafficPolicy != nil { in, out := &in.ExternalTrafficPolicy, &out.ExternalTrafficPolicy - *out = new(corev1.ServiceExternalTrafficPolicyType) + *out = new(corev1.ServiceExternalTrafficPolicy) **out = **in } } From 2597b8fed473b434df543200ee6532cb968c3953 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 15:01:48 +0500 Subject: [PATCH 07/38] linter --- cmd/pgbackrest/main.go | 2 +- internal/controller/standalone_pgadmin/users.go | 2 +- internal/patroni/config_test.go | 4 ++-- internal/testing/require/exec.go | 2 +- percona/certmanager/certmanager_test.go | 3 +-- percona/controller/pgcluster/controller_test.go | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/pgbackrest/main.go b/cmd/pgbackrest/main.go index 29e0c6b54c..a8260e1f55 100644 --- a/cmd/pgbackrest/main.go +++ b/cmd/pgbackrest/main.go @@ -388,7 +388,7 @@ else fi ` - localHashCmd := exec.Command("bash", "-ceu", "--", localScript) + localHashCmd := exec.CommandContext(ctx, "bash", "-ceu", "--", localScript) hashOutput, err := localHashCmd.Output() if err != nil { log.Fatalf("unable to calculate hash for pgBackRest config: %v", err) diff --git a/internal/controller/standalone_pgadmin/users.go b/internal/controller/standalone_pgadmin/users.go index 29ea326075..31aaac78be 100644 --- a/internal/controller/standalone_pgadmin/users.go +++ b/internal/controller/standalone_pgadmin/users.go @@ -293,7 +293,7 @@ cd $PGADMIN_DIR // to add a user, that user will not be in intentUsers. If errors occurred when attempting to // update a user, the user will be in intentUsers as it existed before. We now want to marshal the // intentUsers to json and write the users.json file to the secret. - intentUserSecret.Data["users.json"], _ = json.Marshal(intentUsers) + intentUserSecret.Data["users.json"], _ = json.Marshal(intentUsers) //nolint:gosec //TODO:investigate the security concern err = errors.WithStack(r.setControllerReference(pgadmin, intentUserSecret)) if err == nil { diff --git a/internal/patroni/config_test.go b/internal/patroni/config_test.go index dd8dd58de3..9ac89ce380 100644 --- a/internal/patroni/config_test.go +++ b/internal/patroni/config_test.go @@ -1285,7 +1285,7 @@ func TestPGBackRestCreateReplicaCommand(t *testing.T) { file := filepath.Join(dir, "command.sh") assert.NilError(t, os.WriteFile(file, []byte(command), 0o600)) - cmd := exec.Command(shellcheck, "--enable=all", "--shell=sh", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", "--shell=sh", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } @@ -1307,7 +1307,7 @@ func TestPGBackRestCreateReplicaCommand(t *testing.T) { file := filepath.Join(dir, "script.bash") assert.NilError(t, os.WriteFile(file, []byte(script), 0o600)) - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/testing/require/exec.go b/internal/testing/require/exec.go index c182e84996..ad5ef9428f 100644 --- a/internal/testing/require/exec.go +++ b/internal/testing/require/exec.go @@ -38,7 +38,7 @@ func executable(name string, args ...string) func(testing.TB) string { t.Helper() once.Do(func() { path, err := exec.LookPath(name) - cmd := exec.Command(path, args...) // #nosec G204 -- args from init() + cmd := exec.Command(path, args...) //nolint:noctx // #nosec G204 -- args from init() if err != nil { result = func(t testing.TB) string { diff --git a/percona/certmanager/certmanager_test.go b/percona/certmanager/certmanager_test.go index d82194f1e3..94762e0b97 100644 --- a/percona/certmanager/certmanager_test.go +++ b/percona/certmanager/certmanager_test.go @@ -2,7 +2,6 @@ package certmanager import ( "context" - "fmt" "testing" "time" @@ -174,7 +173,7 @@ func TestCheck(t *testing.T) { ctrl := NewController(cl, cl.Scheme(), false).(*controller) ctrl.newChecker = func(_ *rest.Config, _ string) (cmapichecker.Interface, error) { return &mockChecker{ - err: fmt.Errorf("some unexpected error"), + err: errors.Errorf("some unexpected error"), }, nil } diff --git a/percona/controller/pgcluster/controller_test.go b/percona/controller/pgcluster/controller_test.go index 251b856f1b..13ac90f7aa 100644 --- a/percona/controller/pgcluster/controller_test.go +++ b/percona/controller/pgcluster/controller_test.go @@ -489,7 +489,7 @@ type tracerWithCounter struct { //nolint:unused t trace.Tracer } -func (t *tracerWithCounter) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) { +func (t *tracerWithCounter) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) { //nolint:unused ctx, span := t.t.Start(ctx, spanName, opts...) if spanName == "Reconcile" { t.counter++ From 8e6836ccb71b144643ead54c9918ec19004fe685 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 15:15:24 +0500 Subject: [PATCH 08/38] linter --- internal/bridge/client.go | 2 +- internal/bridge/client_test.go | 8 +++--- .../controller/postgrescluster/pgbackrest.go | 8 +++--- .../postgrescluster/pgbackrest_test.go | 5 ++-- .../controller/postgrescluster/pgmonitor.go | 2 +- internal/controller/postgrescluster/pki.go | 27 +++---------------- internal/pki/encoding_test.go | 10 ++++--- internal/upgradecheck/http.go | 2 +- percona/controller/pgcluster/version_test.go | 2 +- 9 files changed, 25 insertions(+), 41 deletions(-) diff --git a/internal/bridge/client.go b/internal/bridge/client.go index b4316f6e83..9cbf658828 100644 --- a/internal/bridge/client.go +++ b/internal/bridge/client.go @@ -279,7 +279,7 @@ func (c *Client) doWithBackoff( request.Header = headers.Clone() //nolint:bodyclose // This response is returned to the caller. - response, err = c.Client.Do(request) + response, err = c.Do(request) } // An error indicates there was no response from the server, and the diff --git a/internal/bridge/client_test.go b/internal/bridge/client_test.go index a9cd66ada2..9d1303ff67 100644 --- a/internal/bridge/client_test.go +++ b/internal/bridge/client_test.go @@ -111,8 +111,8 @@ func TestClientDoWithBackoff(t *testing.T) { // Client with brief backoff. client := NewClient(server.URL, "") - client.Backoff.Duration = time.Millisecond - client.Backoff.Steps = 5 + client.Duration = time.Millisecond + client.Steps = 5 assert.Equal(t, client.BaseURL.String(), server.URL) ctx := context.Background() @@ -168,8 +168,8 @@ func TestClientDoWithBackoff(t *testing.T) { // Client with brief backoff. client := NewClient(server.URL, "") - client.Backoff.Duration = time.Millisecond - client.Backoff.Steps = 5 + client.Duration = time.Millisecond + client.Steps = 5 assert.Equal(t, client.BaseURL.String(), server.URL) ctx := context.Background() diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index 9d50a408ee..ff400bd369 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -2460,7 +2460,7 @@ func (r *Reconciler) reconcileDedicatedRepoHost(ctx context.Context, if isCreate { r.Recorder.Eventf(postgresCluster, corev1.EventTypeNormal, EventRepoHostCreated, - "created pgBackRest repository host %s/%s", repoHost.TypeMeta.Kind, repoHostName) + "created pgBackRest repository host %s/%s", repoHost.Kind, repoHostName) } return repoHost, nil @@ -2664,7 +2664,7 @@ func (r *Reconciler) reconcileManualBackup(ctx context.Context, backupJob := &batchv1.Job{} backupJob.ObjectMeta = naming.PGBackRestBackupJob(postgresCluster) if currentBackupJob != nil { - backupJob.ObjectMeta.Name = currentBackupJob.ObjectMeta.Name + backupJob.Name = currentBackupJob.ObjectMeta.Name } var labels, annotations map[string]string @@ -2678,8 +2678,8 @@ func (r *Reconciler) reconcileManualBackup(ctx context.Context, map[string]string{ naming.PGBackRestBackup: manualAnnotation, }) - backupJob.ObjectMeta.Labels = labels - backupJob.ObjectMeta.Annotations = annotations + backupJob.Labels = labels + backupJob.Annotations = annotations // K8SPG-703 backupJob.Finalizers = []string{pNaming.FinalizerKeepJob} diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index fd2f8deaed..a3d2a49ad5 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -479,9 +479,10 @@ topologySpreadConstraints: var instanceConfFound, dedicatedRepoConfFound bool for k, v := range config.Data { if v != "" { - if k == pgbackrest.CMInstanceKey { + switch k { + case pgbackrest.CMInstanceKey: instanceConfFound = true - } else if k == pgbackrest.CMRepoKey { + case pgbackrest.CMRepoKey: dedicatedRepoConfFound = true } } diff --git a/internal/controller/postgrescluster/pgmonitor.go b/internal/controller/postgrescluster/pgmonitor.go index 3c9f00272e..6efeb30186 100644 --- a/internal/controller/postgrescluster/pgmonitor.go +++ b/internal/controller/postgrescluster/pgmonitor.go @@ -346,7 +346,7 @@ func addPGMonitorExporterToInstancePodSpec( }, }, } - configVolume.VolumeSource.Projected.Sources = append(configVolume.VolumeSource.Projected.Sources, + configVolume.Projected.Sources = append(configVolume.VolumeSource.Projected.Sources, defaultConfigVolumeProjection) } diff --git a/internal/controller/postgrescluster/pki.go b/internal/controller/postgrescluster/pki.go index 79041fddcd..a8f9b401fb 100644 --- a/internal/controller/postgrescluster/pki.go +++ b/internal/controller/postgrescluster/pki.go @@ -7,12 +7,10 @@ package postgrescluster import ( "context" - gover "github.com/hashicorp/go-version" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/percona/percona-postgresql-operator/v3/internal/logging" @@ -66,17 +64,6 @@ func (r *Reconciler) reconcileRootCertificate( err := errors.WithStack( r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing)) - // K8SPG-555: we need to check ca certificate from old operator versions - // TODO: remove when 2.4.0 will become unsupported - if k8serrors.IsNotFound(err) { - nn := client.ObjectKeyFromObject(existing) - nn.Name = naming.RootCertSecret - err = errors.WithStack( - r.Client.Get(ctx, nn, existing)) - if err == nil { - existing.Name = naming.RootCertSecret - } - } if k8serrors.IsNotFound(err) { err = nil @@ -126,20 +113,14 @@ func (r *Reconciler) reconcileRootCertificate( // K8SPG-555 intent := &corev1.Secret{ - ObjectMeta: metav1.ObjectMeta{ - Name: existing.Name, - Namespace: existing.Namespace, - }, + ObjectMeta: naming.PostgresRootCASecret(cluster), } intent.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Secret")) intent.Data = make(map[string][]byte) - if cluster.Labels != nil { - currVersion, err := gover.NewVersion(cluster.Labels[naming.LabelVersion]) - if err == nil && currVersion.GreaterThanOrEqual(gover.Must(gover.NewVersion("2.6.0"))) && cluster.Spec.Metadata != nil { - intent.Labels = cluster.Spec.Metadata.Labels - intent.Annotations = cluster.Spec.Metadata.Annotations - } + if cluster.Spec.Metadata != nil { + intent.Labels = cluster.Spec.Metadata.Labels + intent.Annotations = cluster.Spec.Metadata.Annotations } if err == nil { diff --git a/internal/pki/encoding_test.go b/internal/pki/encoding_test.go index 52af916aa8..1a5bcfd30c 100644 --- a/internal/pki/encoding_test.go +++ b/internal/pki/encoding_test.go @@ -72,6 +72,7 @@ func TestCertificateTextMarshaling(t *testing.T) { }) t.Run("ReadByOpenSSL", func(t *testing.T) { + ctx := t.Context() openssl := require.OpenSSL(t) dir := t.TempDir() @@ -81,7 +82,7 @@ func TestCertificateTextMarshaling(t *testing.T) { assert.NilError(t, os.WriteFile(certFile, certBytes, 0o600)) // The "openssl x509" command parses X.509 certificates. - cmd := exec.Command(openssl, "x509", + cmd := exec.CommandContext(ctx, openssl, "x509", "-in", certFile, "-inform", "PEM", "-noout", "-text") output, err := cmd.CombinedOutput() @@ -144,6 +145,7 @@ func TestPrivateKeyTextMarshaling(t *testing.T) { }) t.Run("ReadByOpenSSL", func(t *testing.T) { + ctx := t.Context() openssl := require.OpenSSL(t) dir := t.TempDir() @@ -153,7 +155,7 @@ func TestPrivateKeyTextMarshaling(t *testing.T) { assert.NilError(t, os.WriteFile(keyFile, keyBytes, 0o600)) // The "openssl pkey" command processes public and private keys. - cmd := exec.Command(openssl, "pkey", + cmd := exec.CommandContext(ctx, openssl, "pkey", "-in", keyFile, "-inform", "PEM", "-noout", "-text") output, err := cmd.CombinedOutput() @@ -164,12 +166,12 @@ func TestPrivateKeyTextMarshaling(t *testing.T) { "expected valid private key, got:\n%s", output) t.Run("Check", func(t *testing.T) { - output, _ := exec.Command(openssl, "pkey", "-help").CombinedOutput() + output, _ := exec.CommandContext(ctx, openssl, "pkey", "-help").CombinedOutput() if !strings.Contains(string(output), "-check") { t.Skip(`requires "-check" flag`) } - cmd := exec.Command(openssl, "pkey", + cmd := exec.CommandContext(ctx, openssl, "pkey", "-check", "-in", keyFile, "-inform", "PEM", "-noout", "-text") output, err := cmd.CombinedOutput() diff --git a/internal/upgradecheck/http.go b/internal/upgradecheck/http.go index bae98f15f2..d09b4ff95d 100644 --- a/internal/upgradecheck/http.go +++ b/internal/upgradecheck/http.go @@ -72,7 +72,7 @@ func checkForUpgrades(ctx context.Context, url, versionString string, backoff wa var headerPayloadStruct *clientUpgradeData // Prep request - req, err := http.NewRequest("GET", url, nil) + req, err := http.NewRequestWithContext(ctx, "GET", url, nil) if err == nil { // generateHeader always returns some sort of struct, using defaults/nil values // in case some of the checks return errors diff --git a/percona/controller/pgcluster/version_test.go b/percona/controller/pgcluster/version_test.go index 4ded211132..77171519b5 100644 --- a/percona/controller/pgcluster/version_test.go +++ b/percona/controller/pgcluster/version_test.go @@ -227,7 +227,7 @@ func (vs *fakeVS) Start(t *testing.T) error { Handler: gwmux, ReadHeaderTimeout: time.Second * 10, } - gwLis, err := net.Listen("tcp", gwServer.Addr) + gwLis, err := new(net.ListenConfig).Listen(context.Background(), "tcp", gwServer.Addr) if err != nil { return errors.Wrap(err, "failed to listen gateway") } From c795f09e75b959122442f4b91e0968206c1826fc Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 15:26:09 +0500 Subject: [PATCH 09/38] linter --- internal/controller/postgrescluster/pgbackrest.go | 6 +++--- internal/controller/postgrescluster/pgmonitor.go | 2 +- internal/controller/postgrescluster/util_test.go | 2 +- internal/controller/standalone_pgadmin/service.go | 4 ++-- internal/upgradecheck/header_test.go | 8 ++++---- internal/upgradecheck/http_test.go | 4 ++-- percona/controller/pgcluster/testutils_test.go | 6 +++--- percona/extensions/s3.go | 6 +++--- percona/k8s/testutils_test.go | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index ff400bd369..2c76a998d3 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -2834,7 +2834,7 @@ func (r *Reconciler) reconcileReplicaCreateBackup(ctx context.Context, backupJob := &batchv1.Job{} backupJob.ObjectMeta = naming.PGBackRestBackupJob(postgresCluster) if job != nil { - backupJob.ObjectMeta.Name = job.ObjectMeta.Name + backupJob.Name = job.ObjectMeta.Name } var labels, annotations map[string]string @@ -2852,8 +2852,8 @@ func (r *Reconciler) reconcileReplicaCreateBackup(ctx context.Context, map[string]string{ naming.PGBackRestConfigHash: configHash, }) - backupJob.ObjectMeta.Labels = labels - backupJob.ObjectMeta.Annotations = annotations + backupJob.Labels = labels + backupJob.Annotations = annotations // K8SPG-613 initImage, err := k8s.InitImage(ctx, r.Client, postgresCluster, &postgresCluster.Spec.Backups.PGBackRest) diff --git a/internal/controller/postgrescluster/pgmonitor.go b/internal/controller/postgrescluster/pgmonitor.go index 6efeb30186..f54ed2c430 100644 --- a/internal/controller/postgrescluster/pgmonitor.go +++ b/internal/controller/postgrescluster/pgmonitor.go @@ -346,7 +346,7 @@ func addPGMonitorExporterToInstancePodSpec( }, }, } - configVolume.Projected.Sources = append(configVolume.VolumeSource.Projected.Sources, + configVolume.Projected.Sources = append(configVolume.Projected.Sources, defaultConfigVolumeProjection) } diff --git a/internal/controller/postgrescluster/util_test.go b/internal/controller/postgrescluster/util_test.go index 6366460f7b..da0f3bb256 100644 --- a/internal/controller/postgrescluster/util_test.go +++ b/internal/controller/postgrescluster/util_test.go @@ -81,7 +81,7 @@ func TestAddDevSHM(t *testing.T) { // check there is an empty dir mounted under the dshm volume for _, v := range template.Spec.Volumes { - if v.Name == "dshm" && v.VolumeSource.EmptyDir != nil && v.VolumeSource.EmptyDir.Medium == corev1.StorageMediumMemory { + if v.Name == "dshm" && v.EmptyDir != nil && v.VolumeSource.EmptyDir.Medium == corev1.StorageMediumMemory { found = true break } diff --git a/internal/controller/standalone_pgadmin/service.go b/internal/controller/standalone_pgadmin/service.go index 16a7f30b17..e32a4d86fb 100644 --- a/internal/controller/standalone_pgadmin/service.go +++ b/internal/controller/standalone_pgadmin/service.go @@ -38,7 +38,7 @@ func (r *PGAdminReconciler) reconcilePGAdminService( // need to delete any existing service(s). At the start of every reconcile // get all services that match the current pgAdmin labels. services := corev1.ServiceList{} - if err := r.Client.List(ctx, &services, + if err := r.List(ctx, &services, client.InNamespace(pgadmin.Namespace), client.MatchingLabels{ naming.LabelStandalonePGAdmin: pgadmin.Name, @@ -64,7 +64,7 @@ func (r *PGAdminReconciler) reconcilePGAdminService( if pgadmin.Spec.ServiceName != "" { // Look for an existing service with name ServiceName in the namespace existingService := &corev1.Service{} - err := r.Client.Get(ctx, types.NamespacedName{ + err := r.Get(ctx, types.NamespacedName{ Name: pgadmin.Spec.ServiceName, Namespace: pgadmin.GetNamespace(), }, existingService) diff --git a/internal/upgradecheck/header_test.go b/internal/upgradecheck/header_test.go index 31841bf5e5..2a400f5c85 100644 --- a/internal/upgradecheck/header_test.go +++ b/internal/upgradecheck/header_test.go @@ -522,7 +522,7 @@ func TestGetManagedClusters(t *testing.T) { ctx := context.Background() t.Run("success", func(t *testing.T) { - fakeClient := setupFakeClientWithPGOScheme(t, true) + fakeClient := setupFakeClientWithPGOScheme(t) ctx, calls := setupLogCapture(ctx) count := getManagedClusters(ctx, fakeClient) assert.Equal(t, len(*calls), 0) @@ -531,7 +531,7 @@ func TestGetManagedClusters(t *testing.T) { t.Run("list throw error", func(t *testing.T) { fakeClientWithOptionalError := &fakeClientWithError{ - setupFakeClientWithPGOScheme(t, true), "list error", + setupFakeClientWithPGOScheme(t), "list error", } ctx, calls := setupLogCapture(ctx) count := getManagedClusters(ctx, fakeClientWithOptionalError) @@ -545,7 +545,7 @@ func TestGetBridgeClusters(t *testing.T) { ctx := context.Background() t.Run("success", func(t *testing.T) { - fakeClient := setupFakeClientWithPGOScheme(t, true) + fakeClient := setupFakeClientWithPGOScheme(t) ctx, calls := setupLogCapture(ctx) count := getBridgeClusters(ctx, fakeClient) assert.Equal(t, len(*calls), 0) @@ -554,7 +554,7 @@ func TestGetBridgeClusters(t *testing.T) { t.Run("list throw error", func(t *testing.T) { fakeClientWithOptionalError := &fakeClientWithError{ - setupFakeClientWithPGOScheme(t, true), "list error", + setupFakeClientWithPGOScheme(t), "list error", } ctx, calls := setupLogCapture(ctx) count := getBridgeClusters(ctx, fakeClientWithOptionalError) diff --git a/internal/upgradecheck/http_test.go b/internal/upgradecheck/http_test.go index 1d40855c9f..a9e2e2a692 100644 --- a/internal/upgradecheck/http_test.go +++ b/internal/upgradecheck/http_test.go @@ -47,7 +47,7 @@ func (m *MockClient) Do(req *http.Request) (*http.Response, error) { } func TestCheckForUpgrades(t *testing.T) { - fakeClient := setupFakeClientWithPGOScheme(t, true) + fakeClient := setupFakeClientWithPGOScheme(t) cfg := &rest.Config{} ctx := logging.NewContext(context.Background(), logging.Discard()) @@ -157,7 +157,7 @@ func TestCheckForUpgrades(t *testing.T) { // TODO(benjaminjb): Replace `fake` with envtest func TestCheckForUpgradesScheduler(t *testing.T) { t.Skip("This test fails when run with 'go test ./...', but passes when run on its own.") // TODO: remove - fakeClient := setupFakeClientWithPGOScheme(t, false) + fakeClient := setupFakeClientWithPGOScheme(t) _, server := setupVersionServer(t, true) defer server.Close() cfg := &rest.Config{Host: server.URL} diff --git a/percona/controller/pgcluster/testutils_test.go b/percona/controller/pgcluster/testutils_test.go index 8bdf15e274..12a00bef18 100644 --- a/percona/controller/pgcluster/testutils_test.go +++ b/percona/controller/pgcluster/testutils_test.go @@ -157,14 +157,14 @@ type fakeClient struct { var _ = client.Client(new(fakeClient)) func (f *fakeClient) Patch(ctx context.Context, obj client.Object, patch client.Patch, options ...client.PatchOption) error { - err := f.Client.Patch(ctx, obj, patch, options...) + err := f.Patch(ctx, obj, patch, options...) if !k8serrors.IsNotFound(err) { return err } - if err := f.Client.Create(ctx, obj); err != nil { + if err := f.Create(ctx, obj); err != nil { return err } - return f.Client.Patch(ctx, obj, patch, options...) + return f.Patch(ctx, obj, patch, options...) } func buildFakeClient(ctx context.Context, cr *v2.PerconaPGCluster, objs ...client.Object) (client.Client, error) { diff --git a/percona/extensions/s3.go b/percona/extensions/s3.go index 4c1d4ed376..31dd83ad48 100644 --- a/percona/extensions/s3.go +++ b/percona/extensions/s3.go @@ -3,9 +3,9 @@ package extensions import ( "io" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/aws" //nolint:staticcheck //TODO:https://perconadev.atlassian.net/browse/K8SPG-1098 + "github.com/aws/aws-sdk-go/aws/session" //nolint:staticcheck + "github.com/aws/aws-sdk-go/service/s3" //nolint:staticcheck ) type S3 struct { diff --git a/percona/k8s/testutils_test.go b/percona/k8s/testutils_test.go index e36d339b28..25e92b7072 100644 --- a/percona/k8s/testutils_test.go +++ b/percona/k8s/testutils_test.go @@ -54,7 +54,7 @@ func buildFakeClient(ctx context.Context, cr *v2.PerconaPGCluster, objs ...clien } objs = append(objs, postgresCluster) - dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster)} + dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster)} //nolint:staticcheck // SA1019: production code still uses corev1.Endpoints for Patroni DCS dcs.Annotations = map[string]string{ "initialize": "system-identifier", } From 1f51ff22002c50df5e1d55e1c4ab888de7d5fbd4 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 15:47:45 +0500 Subject: [PATCH 10/38] linter --- internal/upgradecheck/header_test.go | 8 ++++---- internal/upgradecheck/http_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/upgradecheck/header_test.go b/internal/upgradecheck/header_test.go index 2a400f5c85..31841bf5e5 100644 --- a/internal/upgradecheck/header_test.go +++ b/internal/upgradecheck/header_test.go @@ -522,7 +522,7 @@ func TestGetManagedClusters(t *testing.T) { ctx := context.Background() t.Run("success", func(t *testing.T) { - fakeClient := setupFakeClientWithPGOScheme(t) + fakeClient := setupFakeClientWithPGOScheme(t, true) ctx, calls := setupLogCapture(ctx) count := getManagedClusters(ctx, fakeClient) assert.Equal(t, len(*calls), 0) @@ -531,7 +531,7 @@ func TestGetManagedClusters(t *testing.T) { t.Run("list throw error", func(t *testing.T) { fakeClientWithOptionalError := &fakeClientWithError{ - setupFakeClientWithPGOScheme(t), "list error", + setupFakeClientWithPGOScheme(t, true), "list error", } ctx, calls := setupLogCapture(ctx) count := getManagedClusters(ctx, fakeClientWithOptionalError) @@ -545,7 +545,7 @@ func TestGetBridgeClusters(t *testing.T) { ctx := context.Background() t.Run("success", func(t *testing.T) { - fakeClient := setupFakeClientWithPGOScheme(t) + fakeClient := setupFakeClientWithPGOScheme(t, true) ctx, calls := setupLogCapture(ctx) count := getBridgeClusters(ctx, fakeClient) assert.Equal(t, len(*calls), 0) @@ -554,7 +554,7 @@ func TestGetBridgeClusters(t *testing.T) { t.Run("list throw error", func(t *testing.T) { fakeClientWithOptionalError := &fakeClientWithError{ - setupFakeClientWithPGOScheme(t), "list error", + setupFakeClientWithPGOScheme(t, true), "list error", } ctx, calls := setupLogCapture(ctx) count := getBridgeClusters(ctx, fakeClientWithOptionalError) diff --git a/internal/upgradecheck/http_test.go b/internal/upgradecheck/http_test.go index a9e2e2a692..a2a1e24809 100644 --- a/internal/upgradecheck/http_test.go +++ b/internal/upgradecheck/http_test.go @@ -47,7 +47,7 @@ func (m *MockClient) Do(req *http.Request) (*http.Response, error) { } func TestCheckForUpgrades(t *testing.T) { - fakeClient := setupFakeClientWithPGOScheme(t) + fakeClient := setupFakeClientWithPGOScheme(t, true) cfg := &rest.Config{} ctx := logging.NewContext(context.Background(), logging.Discard()) @@ -157,7 +157,7 @@ func TestCheckForUpgrades(t *testing.T) { // TODO(benjaminjb): Replace `fake` with envtest func TestCheckForUpgradesScheduler(t *testing.T) { t.Skip("This test fails when run with 'go test ./...', but passes when run on its own.") // TODO: remove - fakeClient := setupFakeClientWithPGOScheme(t) + fakeClient := setupFakeClientWithPGOScheme(t, true) _, server := setupVersionServer(t, true) defer server.Close() cfg := &rest.Config{Host: server.URL} From 571589a825b76825c64b53c0f9cc6b7d3745a53f Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 15:59:54 +0500 Subject: [PATCH 11/38] linter --- internal/bridge/client_test.go | 4 +-- .../crunchybridgecluster/delete_test.go | 4 +-- internal/postgres/config_test.go | 32 ++++++++++++------- percona/controller/pgcluster/finalizer.go | 1 - 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/internal/bridge/client_test.go b/internal/bridge/client_test.go index 9d1303ff67..b1a46c9677 100644 --- a/internal/bridge/client_test.go +++ b/internal/bridge/client_test.go @@ -188,8 +188,8 @@ func TestClientDoWithBackoff(t *testing.T) { // Client with lots of brief backoff. client := NewClient(server.URL, "") - client.Backoff.Duration = time.Millisecond - client.Backoff.Steps = 100 + client.Duration = time.Millisecond + client.Steps = 100 assert.Equal(t, client.BaseURL.String(), server.URL) ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond) diff --git a/internal/bridge/crunchybridgecluster/delete_test.go b/internal/bridge/crunchybridgecluster/delete_test.go index 376d3edc33..c4ea4be54a 100644 --- a/internal/bridge/crunchybridgecluster/delete_test.go +++ b/internal/bridge/crunchybridgecluster/delete_test.go @@ -65,7 +65,7 @@ func TestHandleDeleteCluster(t *testing.T) { // Get cluster from kubernetes and assert that the deletion timestamp was added assert.NilError(t, tClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster)) - assert.Check(t, !cluster.ObjectMeta.DeletionTimestamp.IsZero()) + assert.Check(t, !cluster.DeletionTimestamp.IsZero()) // Note: We must run handleDelete multiple times because we don't want to remove the // finalizer until we're sure that the cluster has been deleted from Bridge, so we @@ -107,7 +107,7 @@ func TestHandleDeleteCluster(t *testing.T) { // Get cluster from kubernetes and assert that the deletion timestamp was added assert.NilError(t, tClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster)) - assert.Check(t, !cluster.ObjectMeta.DeletionTimestamp.IsZero()) + assert.Check(t, !cluster.DeletionTimestamp.IsZero()) // Run handleDelete again to attempt to delete from Bridge, but provide bad api key cluster.Status.ID = "2345" diff --git a/internal/postgres/config_test.go b/internal/postgres/config_test.go index 993057932f..cba7946653 100644 --- a/internal/postgres/config_test.go +++ b/internal/postgres/config_test.go @@ -52,8 +52,10 @@ func TestWALDirectory(t *testing.T) { } func TestBashHalt(t *testing.T) { + ctx := context.Background() + t.Run("NoPipeline", func(t *testing.T) { - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-c", "--", bashHalt+`; halt ab cd e`) var exit *exec.ExitError @@ -65,7 +67,7 @@ func TestBashHalt(t *testing.T) { }) t.Run("PipelineZeroStatus", func(t *testing.T) { - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-c", "--", bashHalt+`; true && halt message`) var exit *exec.ExitError @@ -77,7 +79,7 @@ func TestBashHalt(t *testing.T) { }) t.Run("PipelineNonZeroStatus", func(t *testing.T) { - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-c", "--", bashHalt+`; (exit 99) || halt $'multi\nline'`) var exit *exec.ExitError @@ -89,7 +91,7 @@ func TestBashHalt(t *testing.T) { }) t.Run("Subshell", func(t *testing.T) { - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-c", "--", bashHalt+`; (halt 'err') || echo 'after'`) stderr := new(bytes.Buffer) @@ -104,8 +106,10 @@ func TestBashHalt(t *testing.T) { } func TestBashPermissions(t *testing.T) { + ctx := context.Background() + // macOS `stat` takes different arguments than BusyBox and GNU coreutils. - if output, err := exec.Command("stat", "--help").CombinedOutput(); err != nil { + if output, err := exec.CommandContext(ctx, "stat", "--help").CombinedOutput(); err != nil { t.Skip(`requires "stat" executable`) } else if !strings.Contains(string(output), "%A") { t.Skip(`requires "stat" with access format sequence`) @@ -117,7 +121,7 @@ func TestBashPermissions(t *testing.T) { assert.NilError(t, os.WriteFile(filepath.Join(dir, "sub", "fn"), nil, 0o624)) // #nosec G306 OK permissions for a temp dir in a test assert.NilError(t, os.Chmod(filepath.Join(dir, "sub", "fn"), 0o624)) - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-c", "--", bashPermissions+`; permissions "$@"`, "-", filepath.Join(dir, "sub", "fn")) @@ -131,8 +135,10 @@ func TestBashPermissions(t *testing.T) { } func TestBashRecreateDirectory(t *testing.T) { + ctx := context.Background() + // macOS `stat` takes different arguments than BusyBox and GNU coreutils. - if output, err := exec.Command("stat", "--help").CombinedOutput(); err != nil { + if output, err := exec.CommandContext(ctx, "stat", "--help").CombinedOutput(); err != nil { t.Skip(`requires "stat" executable`) } else if !strings.Contains(string(output), "%a") { t.Skip(`requires "stat" with access format sequence`) @@ -144,7 +150,7 @@ func TestBashRecreateDirectory(t *testing.T) { assert.NilError(t, os.WriteFile(filepath.Join(dir, "d", "file"), nil, 0o644)) // #nosec G306 OK permissions for a temp dir in a test stat := func(args ...string) string { - cmd := exec.Command("stat", "-c", "%i %#a %N") + cmd := exec.CommandContext(ctx, "stat", "-c", "%i %#a %N") cmd.Args = append(cmd.Args, args...) out, err := cmd.CombinedOutput() @@ -161,7 +167,7 @@ func TestBashRecreateDirectory(t *testing.T) { filepath.Join(dir, "d", "file"), ) - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-ceu", "--", bashRecreateDirectory+` recreate "$@"`, "-", filepath.Join(dir, "d"), "0740") @@ -199,8 +205,10 @@ func TestBashRecreateDirectory(t *testing.T) { } func TestBashSafeLink(t *testing.T) { + ctx := context.Background() + // macOS `mv` takes different arguments than GNU coreutils. - if output, err := exec.Command("mv", "--help").CombinedOutput(); err != nil { + if output, err := exec.CommandContext(ctx, "mv", "--help").CombinedOutput(); err != nil { t.Skip(`requires "mv" executable`) } else if !strings.Contains(string(output), "no-target-directory") { t.Skip(`requires "mv" that overwrites a directory symlink`) @@ -208,7 +216,7 @@ func TestBashSafeLink(t *testing.T) { // execute calls the bash function with args. execute := func(args ...string) (string, error) { - cmd := exec.Command("bash") + cmd := exec.CommandContext(ctx, "bash") cmd.Args = append(cmd.Args, "-ceu", "--", bashSafeLink+`safelink "$@"`, "-") cmd.Args = append(cmd.Args, args...) output, err := cmd.CombinedOutput() @@ -475,7 +483,7 @@ func TestStartupCommand(t *testing.T) { assert.NilError(t, os.WriteFile(file, []byte(script), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(ctx, shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) diff --git a/percona/controller/pgcluster/finalizer.go b/percona/controller/pgcluster/finalizer.go index 3497ee764c..a6a71f950d 100644 --- a/percona/controller/pgcluster/finalizer.go +++ b/percona/controller/pgcluster/finalizer.go @@ -84,7 +84,6 @@ func (r *PGClusterReconciler) deleteTLSSecrets(ctx context.Context, cr *v2.Perco naming.ClusterPGBouncer(crunchyCluster), } if cr.Spec.Secrets.CustomRootCATLSSecret == nil { - secretsMeta = append(secretsMeta, metav1.ObjectMeta{Namespace: crunchyCluster.Namespace, Name: naming.RootCertSecret}) secretsMeta = append(secretsMeta, naming.PostgresRootCASecret(crunchyCluster)) } if cr.Spec.Secrets.CustomTLSSecret == nil { From 267d84d2024b5ead2c7c10485aff1f97d9da2b8b Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 16:18:30 +0500 Subject: [PATCH 12/38] linter --- internal/bridge/crunchybridgecluster/apply.go | 2 +- .../crunchybridgecluster_controller.go | 6 ++-- .../bridge/crunchybridgecluster/postgres.go | 4 +-- internal/bridge/installation_test.go | 10 +++--- .../postgrescluster/cluster_test.go | 36 +++++++++---------- .../postgrescluster/patroni_test.go | 12 +++---- .../postgrescluster/pgadmin_test.go | 12 +++---- .../controller/postgrescluster/pgbackrest.go | 4 +-- .../postgrescluster/pgbackrest_test.go | 22 ++++++------ .../postgrescluster/pgbouncer_test.go | 12 +++---- internal/controller/postgrescluster/pki.go | 2 +- .../controller/postgrescluster/pki_test.go | 26 +++++++------- .../controller/postgrescluster/postgres.go | 2 +- .../postgrescluster/snapshots_test.go | 34 +++++++++--------- .../controller/postgrescluster/util_test.go | 2 +- .../controller/postgrescluster/volumes.go | 18 +++++----- .../standalone_pgadmin/statefulset.go | 4 +-- .../controller/standalone_pgadmin/users.go | 6 ++-- .../standalone_pgadmin/users_test.go | 20 +++++------ .../controller/pgcluster/controller_test.go | 4 +-- 20 files changed, 119 insertions(+), 119 deletions(-) diff --git a/internal/bridge/crunchybridgecluster/apply.go b/internal/bridge/crunchybridgecluster/apply.go index d77d719d6a..01d9de59e6 100644 --- a/internal/bridge/crunchybridgecluster/apply.go +++ b/internal/bridge/crunchybridgecluster/apply.go @@ -22,7 +22,7 @@ func (r *CrunchyBridgeClusterReconciler) patch( patch client.Patch, options ...client.PatchOption, ) error { options = append([]client.PatchOption{r.Owner}, options...) - return r.Client.Patch(ctx, object, patch, options...) + return r.Patch(ctx, object, patch, options...) } // apply sends an apply patch to object's endpoint in the Kubernetes API and diff --git a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go index 5c4505b1f1..18c2b2ab2f 100644 --- a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go +++ b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go @@ -79,7 +79,7 @@ func (r *CrunchyBridgeClusterReconciler) SetupWithManager( func (r *CrunchyBridgeClusterReconciler) setControllerReference( owner *v1beta1.CrunchyBridgeCluster, controlled client.Object, ) error { - return controllerutil.SetControllerReference(owner, controlled, r.Client.Scheme()) + return controllerutil.SetControllerReference(owner, controlled, r.Scheme()) } //+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters",verbs={get,patch,update} @@ -669,7 +669,7 @@ func (r *CrunchyBridgeClusterReconciler) GetSecretKeys( }} err := errors.WithStack( - r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing)) + r.Get(ctx, client.ObjectKeyFromObject(existing), existing)) if err == nil { if existing.Data["key"] != nil && existing.Data["team"] != nil { @@ -692,7 +692,7 @@ func (r *CrunchyBridgeClusterReconciler) deleteControlled( version := object.GetResourceVersion() exactly := client.Preconditions{UID: &uid, ResourceVersion: &version} - return r.Client.Delete(ctx, object, exactly) + return r.Delete(ctx, object, exactly) } return nil diff --git a/internal/bridge/crunchybridgecluster/postgres.go b/internal/bridge/crunchybridgecluster/postgres.go index 44b811a205..c6f7802264 100644 --- a/internal/bridge/crunchybridgecluster/postgres.go +++ b/internal/bridge/crunchybridgecluster/postgres.go @@ -93,7 +93,7 @@ func (r *CrunchyBridgeClusterReconciler) reconcilePostgresRoleSecrets( // Make sure that this cluster's role secret names are not being used by any other // secrets in the namespace allSecretsInNamespace := &corev1.SecretList{} - err := errors.WithStack(r.Client.List(ctx, allSecretsInNamespace, client.InNamespace(cluster.Namespace))) + err := errors.WithStack(r.List(ctx, allSecretsInNamespace, client.InNamespace(cluster.Namespace))) if err != nil { return nil, nil, err } @@ -116,7 +116,7 @@ func (r *CrunchyBridgeClusterReconciler) reconcilePostgresRoleSecrets( selector, err := naming.AsSelector(naming.CrunchyBridgeClusterPostgresRoles(cluster.Name)) if err == nil { err = errors.WithStack( - r.Client.List(ctx, secrets, + r.List(ctx, secrets, client.InNamespace(cluster.Namespace), client.MatchingLabelsSelector{Selector: selector}, )) diff --git a/internal/bridge/installation_test.go b/internal/bridge/installation_test.go index 5c9a6de34f..a2c42921b6 100644 --- a/internal/bridge/installation_test.go +++ b/internal/bridge/installation_test.go @@ -99,7 +99,7 @@ func TestInstallationReconcile(t *testing.T) { reconciler.NewClient = func() *Client { c := NewClient(server.URL, "") - c.Backoff.Steps = 1 + c.Steps = 1 assert.Equal(t, c.BaseURL.String(), server.URL) return c } @@ -155,7 +155,7 @@ func TestInstallationReconcile(t *testing.T) { reconciler.NewClient = func() *Client { c := NewClient(server.URL, "") - c.Backoff.Steps = 1 + c.Steps = 1 assert.Equal(t, c.BaseURL.String(), server.URL) return c } @@ -289,7 +289,7 @@ func TestInstallationReconcile(t *testing.T) { reconciler.NewClient = func() *Client { c := NewClient(server.URL, "") - c.Backoff.Steps = 1 + c.Steps = 1 assert.Equal(t, c.BaseURL.String(), server.URL) return c } @@ -343,7 +343,7 @@ func TestInstallationReconcile(t *testing.T) { reconciler.NewClient = func() *Client { c := NewClient(server.URL, "") - c.Backoff.Steps = 1 + c.Steps = 1 assert.Equal(t, c.BaseURL.String(), server.URL) return c } @@ -426,7 +426,7 @@ func TestInstallationReconcile(t *testing.T) { reconciler.NewClient = func() *Client { c := NewClient(server.URL, "") - c.Backoff.Steps = 1 + c.Steps = 1 assert.Equal(t, c.BaseURL.String(), server.URL) return c } diff --git a/internal/controller/postgrescluster/cluster_test.go b/internal/controller/postgrescluster/cluster_test.go index 0c720ea16f..4d14673340 100644 --- a/internal/controller/postgrescluster/cluster_test.go +++ b/internal/controller/postgrescluster/cluster_test.go @@ -135,8 +135,8 @@ func TestCustomLabels(t *testing.T) { t.Run("Cluster", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "global-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "global-cluster" + cluster.Namespace = ns.Name cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{ Name: "daisy-instance1", InitContainer: &v1beta1.InitContainerSpec{ @@ -189,8 +189,8 @@ func TestCustomLabels(t *testing.T) { t.Run("Instance", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "instance-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "instance-cluster" + cluster.Namespace = ns.Name cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{ Name: "max-instance", InitContainer: &v1beta1.InitContainerSpec{ @@ -245,8 +245,8 @@ func TestCustomLabels(t *testing.T) { t.Run("PGBackRest", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "pgbackrest-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "pgbackrest-cluster" + cluster.Namespace = ns.Name cluster.Spec.Backups.PGBackRest.Metadata = &v1beta1.Metadata{ Labels: map[string]string{"my.pgbackrest.label": "lucy"}, } @@ -289,8 +289,8 @@ func TestCustomLabels(t *testing.T) { t.Run("PGBouncer", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "pgbouncer-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "pgbouncer-cluster" + cluster.Namespace = ns.Name cluster.Spec.Proxy.PGBouncer.Metadata = &v1beta1.Metadata{ Labels: map[string]string{"my.pgbouncer.label": "lucy"}, } @@ -385,8 +385,8 @@ func TestCustomAnnotations(t *testing.T) { t.Run("Cluster", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "global-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "global-cluster" + cluster.Namespace = ns.Name cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{ Name: "daisy-instance1", InitContainer: &v1beta1.InitContainerSpec{ @@ -440,8 +440,8 @@ func TestCustomAnnotations(t *testing.T) { t.Run("Instance", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "instance-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "instance-cluster" + cluster.Namespace = ns.Name cluster.Spec.InstanceSets = []v1beta1.PostgresInstanceSetSpec{{ Name: "max-instance", InitContainer: &v1beta1.InitContainerSpec{ @@ -496,8 +496,8 @@ func TestCustomAnnotations(t *testing.T) { t.Run("PGBackRest", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "pgbackrest-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "pgbackrest-cluster" + cluster.Namespace = ns.Name cluster.Spec.Backups.PGBackRest.Metadata = &v1beta1.Metadata{ Annotations: map[string]string{"my.pgbackrest.annotation": "lucy"}, } @@ -540,8 +540,8 @@ func TestCustomAnnotations(t *testing.T) { t.Run("PGBouncer", func(t *testing.T) { cluster := testCluster() - cluster.ObjectMeta.Name = "pgbouncer-cluster" - cluster.ObjectMeta.Namespace = ns.Name + cluster.Name = "pgbouncer-cluster" + cluster.Namespace = ns.Name cluster.Spec.Proxy.PGBouncer.Metadata = &v1beta1.Metadata{ Annotations: map[string]string{"my.pgbouncer.annotation": "lucy"}, } @@ -811,12 +811,12 @@ type: ClusterIP assert.NilError(t, err) // Annotations present in the metadata. - assert.Assert(t, cmp.MarshalMatches(service.ObjectMeta.Annotations, ` + assert.Assert(t, cmp.MarshalMatches(service.Annotations, ` some: note `)) // Labels present in the metadata. - assert.Assert(t, cmp.MarshalMatches(service.ObjectMeta.Labels, ` + assert.Assert(t, cmp.MarshalMatches(service.Labels, ` app.kubernetes.io/component: pg app.kubernetes.io/instance: pg2 app.kubernetes.io/managed-by: percona-postgresql-operator diff --git a/internal/controller/postgrescluster/patroni_test.go b/internal/controller/postgrescluster/patroni_test.go index aed6a1896a..cf74ecc461 100644 --- a/internal/controller/postgrescluster/patroni_test.go +++ b/internal/controller/postgrescluster/patroni_test.go @@ -106,12 +106,12 @@ ownerReferences: assert.NilError(t, err) // Annotations present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, service.Annotations, map[string]string{ "a": "v1", }) // Labels present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, service.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "postgres-operator.crunchydata.com/cluster": "pg2", "postgres-operator.crunchydata.com/patroni": "pg2-ha", @@ -134,13 +134,13 @@ ownerReferences: assert.NilError(t, err) // Annotations present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, service.Annotations, map[string]string{ "a": "v1", "c": "v3", }) // Labels present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, service.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "d": "v4", "postgres-operator.crunchydata.com/cluster": "pg2", @@ -481,8 +481,8 @@ func TestReconcilePatroniStatus(t *testing.T) { ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster), } if writeAnnotation { - endpoints.ObjectMeta.Annotations = make(map[string]string) - endpoints.ObjectMeta.Annotations["initialize"] = systemIdentifier + endpoints.Annotations = make(map[string]string) + endpoints.Annotations["initialize"] = systemIdentifier } assert.NilError(t, tClient.Create(ctx, endpoints, &client.CreateOptions{})) diff --git a/internal/controller/postgrescluster/pgadmin_test.go b/internal/controller/postgrescluster/pgadmin_test.go index 72b9fcd9ed..3c8b034dc2 100644 --- a/internal/controller/postgrescluster/pgadmin_test.go +++ b/internal/controller/postgrescluster/pgadmin_test.go @@ -110,12 +110,12 @@ ownerReferences: assert.Assert(t, specified) // Annotations present in the metadata. - assert.DeepEqual(t, configmap.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, configmap.Annotations, map[string]string{ "a": "v5", "b": "v2", "e": "v6", }) // Labels present in the metadata. - assert.DeepEqual(t, configmap.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, configmap.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "c": "v7", "d": "v4", "f": "v8", "postgres-operator.crunchydata.com/cluster": "pg1", "postgres-operator.crunchydata.com/role": "pgadmin", @@ -206,12 +206,12 @@ ownerReferences: assert.Assert(t, specified) // Annotations present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, service.Annotations, map[string]string{ "a": "v1", }) // Labels present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, service.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "postgres-operator.crunchydata.com/cluster": "my-cluster", "postgres-operator.crunchydata.com/role": "pgadmin", @@ -237,13 +237,13 @@ ownerReferences: assert.Assert(t, specified) // Annotations present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, service.Annotations, map[string]string{ "a": "v1", "c": "v3", }) // Labels present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, service.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "d": "v4", "postgres-operator.crunchydata.com/cluster": "my-cluster", diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index 2c76a998d3..a4ec79f9a3 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -2664,7 +2664,7 @@ func (r *Reconciler) reconcileManualBackup(ctx context.Context, backupJob := &batchv1.Job{} backupJob.ObjectMeta = naming.PGBackRestBackupJob(postgresCluster) if currentBackupJob != nil { - backupJob.Name = currentBackupJob.ObjectMeta.Name + backupJob.Name = currentBackupJob.Name } var labels, annotations map[string]string @@ -2834,7 +2834,7 @@ func (r *Reconciler) reconcileReplicaCreateBackup(ctx context.Context, backupJob := &batchv1.Job{} backupJob.ObjectMeta = naming.PGBackRestBackupJob(postgresCluster) if job != nil { - backupJob.Name = job.ObjectMeta.Name + backupJob.Name = job.Name } var labels, annotations map[string]string diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index a3d2a49ad5..8b68a4a82e 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -3220,11 +3220,11 @@ func TestGenerateRestoreJobIntent(t *testing.T) { t.Run(fmt.Sprintf("openshift-%v", openshift), func(t *testing.T) { t.Run("ObjectMeta", func(t *testing.T) { t.Run("Name", func(t *testing.T) { - assert.Equal(t, job.ObjectMeta.Name, + assert.Equal(t, job.Name, naming.PGBackRestRestoreJob(cluster).Name) }) t.Run("Namespace", func(t *testing.T) { - assert.Equal(t, job.ObjectMeta.Namespace, + assert.Equal(t, job.Namespace, naming.PGBackRestRestoreJob(cluster).Namespace) }) t.Run("Annotations", func(t *testing.T) { @@ -3689,15 +3689,15 @@ func TestObserveRestoreEnv(t *testing.T) { createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster) { fakeLeaderEP := &corev1.Endpoints{} fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) - fakeLeaderEP.ObjectMeta.Namespace = namespace + fakeLeaderEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeLeaderEP)) fakeDCSEP := &corev1.Endpoints{} fakeDCSEP.ObjectMeta = naming.PatroniDistributedConfiguration(cluster) - fakeDCSEP.ObjectMeta.Namespace = namespace + fakeDCSEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeDCSEP)) fakeFailoverEP := &corev1.Endpoints{} fakeFailoverEP.ObjectMeta = naming.PatroniTrigger(cluster) - fakeFailoverEP.ObjectMeta.Namespace = namespace + fakeFailoverEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeFailoverEP)) job := generateJob(cluster.Name, new(false), new(false)) @@ -3713,15 +3713,15 @@ func TestObserveRestoreEnv(t *testing.T) { createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster) { fakeLeaderEP := &corev1.Endpoints{} fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) - fakeLeaderEP.ObjectMeta.Namespace = namespace + fakeLeaderEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeLeaderEP)) fakeDCSEP := &corev1.Endpoints{} fakeDCSEP.ObjectMeta = naming.PatroniDistributedConfiguration(cluster) - fakeDCSEP.ObjectMeta.Namespace = namespace + fakeDCSEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeDCSEP)) fakeFailoverEP := &corev1.Endpoints{} fakeFailoverEP.ObjectMeta = naming.PatroniTrigger(cluster) - fakeFailoverEP.ObjectMeta.Namespace = namespace + fakeFailoverEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeFailoverEP)) }, result: testResult{ @@ -3894,15 +3894,15 @@ func TestPrepareForRestore(t *testing.T) { ) (*batchv1.Job, []corev1.Endpoints) { fakeLeaderEP := corev1.Endpoints{} fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) - fakeLeaderEP.ObjectMeta.Namespace = namespace + fakeLeaderEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, &fakeLeaderEP)) fakeDCSEP := corev1.Endpoints{} fakeDCSEP.ObjectMeta = naming.PatroniDistributedConfiguration(cluster) - fakeDCSEP.ObjectMeta.Namespace = namespace + fakeDCSEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, &fakeDCSEP)) fakeFailoverEP := corev1.Endpoints{} fakeFailoverEP.ObjectMeta = naming.PatroniTrigger(cluster) - fakeFailoverEP.ObjectMeta.Namespace = namespace + fakeFailoverEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, &fakeFailoverEP)) return nil, []corev1.Endpoints{fakeLeaderEP, fakeDCSEP, fakeFailoverEP} }, diff --git a/internal/controller/postgrescluster/pgbouncer_test.go b/internal/controller/postgrescluster/pgbouncer_test.go index 68c1887dad..43ec946860 100644 --- a/internal/controller/postgrescluster/pgbouncer_test.go +++ b/internal/controller/postgrescluster/pgbouncer_test.go @@ -111,12 +111,12 @@ ownerReferences: assert.Assert(t, specified) // Annotations present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, service.Annotations, map[string]string{ "a": "v1", }) // Labels present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, service.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "postgres-operator.crunchydata.com/cluster": "pg7", "postgres-operator.crunchydata.com/role": "pgbouncer", @@ -142,13 +142,13 @@ ownerReferences: assert.Assert(t, specified) // Annotations present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, service.Annotations, map[string]string{ "a": "v1", "c": "v3", }) // Labels present in the metadata. - assert.DeepEqual(t, service.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, service.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "d": "v4", "postgres-operator.crunchydata.com/cluster": "pg7", @@ -429,12 +429,12 @@ namespace: ns3 assert.Assert(t, specified) // Annotations present in the metadata. - assert.DeepEqual(t, deploy.ObjectMeta.Annotations, map[string]string{ + assert.DeepEqual(t, deploy.Annotations, map[string]string{ "a": "v1", }) // Labels present in the metadata. - assert.DeepEqual(t, deploy.ObjectMeta.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ + assert.DeepEqual(t, deploy.Labels, map[string]string(naming.WithPerconaLabels(map[string]string{ "b": "v2", "postgres-operator.crunchydata.com/cluster": "test-cluster", "postgres-operator.crunchydata.com/role": "pgbouncer", diff --git a/internal/controller/postgrescluster/pki.go b/internal/controller/postgrescluster/pki.go index a8f9b401fb..25772e8147 100644 --- a/internal/controller/postgrescluster/pki.go +++ b/internal/controller/postgrescluster/pki.go @@ -268,7 +268,7 @@ func (r *Reconciler) reconcileInternalClusterCertificate( intent := &corev1.Secret{ObjectMeta: naming.PostgresTLSSecret(cluster)} intent.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Secret")) intent.Data = make(map[string][]byte) - intent.ObjectMeta.OwnerReferences = existing.ObjectMeta.OwnerReferences + intent.OwnerReferences = existing.OwnerReferences intent.Annotations = naming.Merge(cluster.Spec.Metadata.GetAnnotationsOrNil()) intent.Labels = naming.Merge( diff --git a/internal/controller/postgrescluster/pki_test.go b/internal/controller/postgrescluster/pki_test.go index 3c4619c122..70bfc3f906 100644 --- a/internal/controller/postgrescluster/pki_test.go +++ b/internal/controller/postgrescluster/pki_test.go @@ -99,7 +99,7 @@ func TestReconcileCerts(t *testing.T) { err := tClient.Get(ctx, client.ObjectKeyFromObject(cluster1CASecret), cluster1CASecret) assert.NilError(t, err) - assert.Check(t, len(cluster1CASecret.ObjectMeta.OwnerReferences) == 1, "first owner reference not set") + assert.Check(t, len(cluster1CASecret.OwnerReferences) == 1, "first owner reference not set") expectedOR := metav1.OwnerReference{ APIVersion: "upstream.pgv3.percona.com/v1beta1", @@ -110,11 +110,11 @@ func TestReconcileCerts(t *testing.T) { BlockOwnerDeletion: new(true), } - assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0].APIVersion, expectedOR.APIVersion) - assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0].Kind, expectedOR.Kind) - assert.Equal(t, cluster1CASecret.ObjectMeta.OwnerReferences[0].Name, expectedOR.Name) - assert.Equal(t, *cluster1CASecret.ObjectMeta.OwnerReferences[0].Controller, true) - assert.Equal(t, *cluster1CASecret.ObjectMeta.OwnerReferences[0].BlockOwnerDeletion, true) + assert.Equal(t, cluster1CASecret.OwnerReferences[0].APIVersion, expectedOR.APIVersion) + assert.Equal(t, cluster1CASecret.OwnerReferences[0].Kind, expectedOR.Kind) + assert.Equal(t, cluster1CASecret.OwnerReferences[0].Name, expectedOR.Name) + assert.Equal(t, *cluster1CASecret.OwnerReferences[0].Controller, true) + assert.Equal(t, *cluster1CASecret.OwnerReferences[0].BlockOwnerDeletion, true) }) t.Run("check root CA secret for cluster2", func(t *testing.T) { @@ -127,7 +127,7 @@ func TestReconcileCerts(t *testing.T) { clist := &v1beta1.PostgresClusterList{} assert.NilError(t, tClient.List(ctx, clist)) - assert.Check(t, len(cluster2CASecret.ObjectMeta.OwnerReferences) == 1, "should be single owner reference") + assert.Check(t, len(cluster2CASecret.OwnerReferences) == 1, "should be single owner reference") expectedOR := metav1.OwnerReference{ APIVersion: "upstream.pgv3.percona.com/v1beta1", @@ -138,11 +138,11 @@ func TestReconcileCerts(t *testing.T) { BlockOwnerDeletion: new(true), } - assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0].APIVersion, expectedOR.APIVersion) - assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0].Kind, expectedOR.Kind) - assert.Equal(t, cluster2CASecret.ObjectMeta.OwnerReferences[0].Name, expectedOR.Name) - assert.Equal(t, *cluster2CASecret.ObjectMeta.OwnerReferences[0].Controller, true) - assert.Equal(t, *cluster2CASecret.ObjectMeta.OwnerReferences[0].BlockOwnerDeletion, true) + assert.Equal(t, cluster2CASecret.OwnerReferences[0].APIVersion, expectedOR.APIVersion) + assert.Equal(t, cluster2CASecret.OwnerReferences[0].Kind, expectedOR.Kind) + assert.Equal(t, cluster2CASecret.OwnerReferences[0].Name, expectedOR.Name) + assert.Equal(t, *cluster2CASecret.OwnerReferences[0].Controller, true) + assert.Equal(t, *cluster2CASecret.OwnerReferences[0].BlockOwnerDeletion, true) }) t.Run("root certificate is returned correctly", func(t *testing.T) { @@ -318,7 +318,7 @@ func TestReconcileCerts(t *testing.T) { testSecret := &corev1.Secret{} testSecret.Namespace, testSecret.Name = namespace, "newcustomsecret" // simulate cluster spec update - cluster2.Spec.CustomTLSSecret.LocalObjectReference.Name = "newcustomsecret" + cluster2.Spec.CustomTLSSecret.Name = "newcustomsecret" // get the expected secret projection testSecretProjection := clusterCertSecretProjection(testSecret) diff --git a/internal/controller/postgrescluster/postgres.go b/internal/controller/postgrescluster/postgres.go index 32b481d83c..ea97f8e579 100644 --- a/internal/controller/postgrescluster/postgres.go +++ b/internal/controller/postgrescluster/postgres.go @@ -569,7 +569,7 @@ func (r *Reconciler) reconcilePostgresUserSecrets( // If both secrets have "pguser" or neither have "pguser", // sort by creation timestamp - return secrets.Items[i].CreationTimestamp.Time.After(secrets.Items[j].CreationTimestamp.Time) + return secrets.Items[i].CreationTimestamp.After(secrets.Items[j].CreationTimestamp.Time) }) // Index secrets by PostgreSQL user name and delete any that are not in the diff --git a/internal/controller/postgrescluster/snapshots_test.go b/internal/controller/postgrescluster/snapshots_test.go index 5a48f1016b..6b30222cbd 100644 --- a/internal/controller/postgrescluster/snapshots_test.go +++ b/internal/controller/postgrescluster/snapshots_test.go @@ -57,7 +57,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) { // Create cluster (without snapshots spec) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" assert.NilError(t, r.Client.Create(ctx, cluster)) t.Cleanup(func() { assert.Check(t, r.Client.Delete(ctx, cluster)) }) @@ -194,7 +194,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) { // Create a cluster with snapshots enabled cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" cluster.Spec.Backups.Snapshots = &v1beta1.VolumeSnapshots{ VolumeSnapshotClassName: volumeSnapshotClassName, } @@ -309,7 +309,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) { // Create a cluster with snapshots enabled cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" cluster.Spec.Backups.Snapshots = &v1beta1.VolumeSnapshots{ VolumeSnapshotClassName: volumeSnapshotClassName, } @@ -371,7 +371,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" assert.NilError(t, r.Client.Create(ctx, cluster)) t.Cleanup(func() { assert.Check(t, r.Client.Delete(ctx, cluster)) }) @@ -428,7 +428,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" cluster.Spec.Backups.Snapshots = &v1beta1.VolumeSnapshots{ VolumeSnapshotClassName: "my-snapshotclass", } @@ -460,7 +460,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" cluster.Spec.Backups.Snapshots = &v1beta1.VolumeSnapshots{ VolumeSnapshotClassName: "my-snapshotclass", } @@ -524,7 +524,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" cluster.Spec.Backups.Snapshots = &v1beta1.VolumeSnapshots{ VolumeSnapshotClassName: "my-snapshotclass", } @@ -623,7 +623,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" cluster.Spec.Backups.Snapshots = &v1beta1.VolumeSnapshots{ VolumeSnapshotClassName: "my-snapshotclass", } @@ -725,7 +725,7 @@ func TestCreateDedicatedSnapshotVolume(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" labelMap := map[string]string{ naming.LabelCluster: cluster.Name, @@ -753,7 +753,7 @@ func TestDedicatedSnapshotVolumeRestore(t *testing.T) { ns := require.Namespace(t, cc) cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" pvc := &corev1.PersistentVolumeClaim{ ObjectMeta: metav1.ObjectMeta{ @@ -839,7 +839,7 @@ func TestGenerateVolumeSnapshot(t *testing.T) { assert.Equal(t, *snapshot.Spec.VolumeSnapshotClassName, "my-snapshot") assert.Equal(t, *snapshot.Spec.Source.PersistentVolumeClaimName, "dedicated-snapshot-volume") assert.Equal(t, snapshot.Labels[naming.LabelCluster], "hippo") - assert.Equal(t, snapshot.ObjectMeta.OwnerReferences[0].Name, "hippo") + assert.Equal(t, snapshot.OwnerReferences[0].Name, "hippo") } func TestGetDedicatedSnapshotVolumeRestoreJob(t *testing.T) { @@ -1111,7 +1111,7 @@ func TestGetSnapshotWithLatestError(t *testing.T) { }, } snapshotWithLatestError := getSnapshotWithLatestError(snapshotList) - assert.Equal(t, snapshotWithLatestError.ObjectMeta.Name, "bad-snapshot") + assert.Equal(t, snapshotWithLatestError.Name, "bad-snapshot") }) t.Run("TwoSnapshotsWithErrors", func(t *testing.T) { @@ -1146,7 +1146,7 @@ func TestGetSnapshotWithLatestError(t *testing.T) { }, } snapshotWithLatestError := getSnapshotWithLatestError(snapshotList) - assert.Equal(t, snapshotWithLatestError.ObjectMeta.Name, "second-bad-snapshot") + assert.Equal(t, snapshotWithLatestError.Name, "second-bad-snapshot") }) } @@ -1342,7 +1342,7 @@ func TestGetLatestReadySnapshot(t *testing.T) { }, } latestReadySnapshot := getLatestReadySnapshot(snapshotList) - assert.Equal(t, latestReadySnapshot.ObjectMeta.Name, "good-snapshot") + assert.Equal(t, latestReadySnapshot.Name, "good-snapshot") }) t.Run("TwoReadySnapshots", func(t *testing.T) { @@ -1373,7 +1373,7 @@ func TestGetLatestReadySnapshot(t *testing.T) { }, } latestReadySnapshot := getLatestReadySnapshot(snapshotList) - assert.Equal(t, latestReadySnapshot.ObjectMeta.Name, "second-good-snapshot") + assert.Equal(t, latestReadySnapshot.Name, "second-good-snapshot") }) } @@ -1392,13 +1392,13 @@ func TestDeleteSnapshots(t *testing.T) { cluster := testCluster() cluster.Namespace = ns.Name - cluster.ObjectMeta.UID = "the-uid-123" + cluster.UID = "the-uid-123" assert.NilError(t, r.Client.Create(ctx, cluster)) rhinoCluster := testCluster() rhinoCluster.Name = "rhino" rhinoCluster.Namespace = ns.Name - rhinoCluster.ObjectMeta.UID = "the-uid-456" + rhinoCluster.UID = "the-uid-456" assert.NilError(t, r.Client.Create(ctx, rhinoCluster)) t.Cleanup(func() { diff --git a/internal/controller/postgrescluster/util_test.go b/internal/controller/postgrescluster/util_test.go index da0f3bb256..7b5af2474f 100644 --- a/internal/controller/postgrescluster/util_test.go +++ b/internal/controller/postgrescluster/util_test.go @@ -81,7 +81,7 @@ func TestAddDevSHM(t *testing.T) { // check there is an empty dir mounted under the dshm volume for _, v := range template.Spec.Volumes { - if v.Name == "dshm" && v.EmptyDir != nil && v.VolumeSource.EmptyDir.Medium == corev1.StorageMediumMemory { + if v.Name == "dshm" && v.EmptyDir != nil && v.EmptyDir.Medium == corev1.StorageMediumMemory { found = true break } diff --git a/internal/controller/postgrescluster/volumes.go b/internal/controller/postgrescluster/volumes.go index 499c738344..6a8d6acc99 100644 --- a/internal/controller/postgrescluster/volumes.go +++ b/internal/controller/postgrescluster/volumes.go @@ -227,7 +227,7 @@ func (r *Reconciler) configureExistingPGVolumes( Spec: cluster.Spec.InstanceSets[0].DataVolumeClaimSpec, } - volume.ObjectMeta.Labels = naming.WithPerconaLabels(map[string]string{ + volume.Labels = naming.WithPerconaLabels(map[string]string{ naming.LabelCluster: cluster.Name, naming.LabelInstanceSet: cluster.Spec.InstanceSets[0].Name, naming.LabelInstance: instanceName, @@ -282,7 +282,7 @@ func (r *Reconciler) configureExistingPGWALVolume( Spec: cluster.Spec.InstanceSets[0].DataVolumeClaimSpec, } - volume.ObjectMeta.Labels = naming.WithPerconaLabels(map[string]string{ + volume.Labels = naming.WithPerconaLabels(map[string]string{ naming.LabelCluster: cluster.Name, naming.LabelInstanceSet: cluster.Spec.InstanceSets[0].Name, naming.LabelInstance: instanceName, @@ -441,14 +441,14 @@ func (r *Reconciler) reconcileMovePGDataDir(ctx context.Context, // at this point, the Job either wasn't found or it has failed, so the it // should be created - moveDirJob.ObjectMeta.Annotations = naming.Merge(cluster.Spec.Metadata. + moveDirJob.Annotations = naming.Merge(cluster.Spec.Metadata. GetAnnotationsOrNil()) labels := naming.Merge(cluster.Spec.DataSource.Volumes.PGDataVolume.Labels, cluster.Spec.Metadata.GetLabelsOrNil(), naming.DirectoryMoveJobLabels(cluster.Name), map[string]string{ naming.LabelMovePGDataDir: "", }) - moveDirJob.ObjectMeta.Labels = labels + moveDirJob.Labels = labels // `patroni.dynamic.json` holds the previous state of the DCS. Since we are // migrating the volumes, we want to clear out any obsolete configuration info. @@ -565,14 +565,14 @@ func (r *Reconciler) reconcileMoveWALDir(ctx context.Context, } } - moveDirJob.ObjectMeta.Annotations = naming.Merge(cluster.Spec.Metadata. + moveDirJob.Annotations = naming.Merge(cluster.Spec.Metadata. GetAnnotationsOrNil()) labels := naming.Merge(cluster.Spec.DataSource.Volumes.PGWALVolume.Labels, cluster.Spec.Metadata.GetLabelsOrNil(), naming.DirectoryMoveJobLabels(cluster.Name), map[string]string{ naming.LabelMovePGWalDir: "", }) - moveDirJob.ObjectMeta.Labels = labels + moveDirJob.Labels = labels script := fmt.Sprintf(`echo "Preparing cluster %s volumes for PGO v5.x" echo "pg_wal_pvc=%s" @@ -587,7 +587,7 @@ func (r *Reconciler) reconcileMoveWALDir(ctx context.Context, cluster.Spec.DataSource.Volumes.PGWALVolume.PVCName, cluster.Spec.DataSource.Volumes.PGWALVolume.Directory, cluster.Spec.DataSource.Volumes.PGWALVolume.Directory, - cluster.ObjectMeta.Name) + cluster.Name) container := corev1.Container{ Command: []string{"bash", "-ceu", script}, @@ -685,14 +685,14 @@ func (r *Reconciler) reconcileMoveRepoDir(ctx context.Context, } } - moveDirJob.ObjectMeta.Annotations = naming.Merge( + moveDirJob.Annotations = naming.Merge( cluster.Spec.Metadata.GetAnnotationsOrNil()) labels := naming.Merge(cluster.Spec.Metadata.GetLabelsOrNil(), naming.DirectoryMoveJobLabels(cluster.Name), map[string]string{ naming.LabelMovePGBackRestRepoDir: "", }) - moveDirJob.ObjectMeta.Labels = labels + moveDirJob.Labels = labels script := fmt.Sprintf(`echo "Preparing cluster %s pgBackRest repo volume for PGO v5.x" echo "repo_pvc=%s" diff --git a/internal/controller/standalone_pgadmin/statefulset.go b/internal/controller/standalone_pgadmin/statefulset.go index 78bfb16f5a..99bfc90f27 100644 --- a/internal/controller/standalone_pgadmin/statefulset.go +++ b/internal/controller/standalone_pgadmin/statefulset.go @@ -33,7 +33,7 @@ func (r *PGAdminReconciler) reconcilePGAdminStatefulSet( // When we delete the StatefulSet, we will leave its Pods in place. They will be claimed by // the StatefulSet that gets created in the next reconcile. existing := &appsv1.StatefulSet{} - if err := errors.WithStack(r.Client.Get(ctx, client.ObjectKeyFromObject(sts), existing)); err != nil { + if err := errors.WithStack(r.Get(ctx, client.ObjectKeyFromObject(sts), existing)); err != nil { if !apierrors.IsNotFound(err) { return err } @@ -46,7 +46,7 @@ func (r *PGAdminReconciler) reconcilePGAdminStatefulSet( exactly := client.Preconditions{UID: &uid, ResourceVersion: &version} propagate := client.PropagationPolicy(metav1.DeletePropagationOrphan) - return errors.WithStack(client.IgnoreNotFound(r.Client.Delete(ctx, existing, exactly, propagate))) + return errors.WithStack(client.IgnoreNotFound(r.Delete(ctx, existing, exactly, propagate))) } } diff --git a/internal/controller/standalone_pgadmin/users.go b/internal/controller/standalone_pgadmin/users.go index 31aaac78be..b3cf2291c0 100644 --- a/internal/controller/standalone_pgadmin/users.go +++ b/internal/controller/standalone_pgadmin/users.go @@ -53,7 +53,7 @@ func (r *PGAdminReconciler) reconcilePGAdminUsers(ctx context.Context, pgadmin * pod := &corev1.Pod{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} pod.Name += "-0" - err := errors.WithStack(r.Client.Get(ctx, client.ObjectKeyFromObject(pod), pod)) + err := errors.WithStack(r.Get(ctx, client.ObjectKeyFromObject(pod), pod)) if err != nil { return client.IgnoreNotFound(err) } @@ -136,7 +136,7 @@ func (r *PGAdminReconciler) writePGAdminUsers(ctx context.Context, pgadmin *v1be existingUserSecret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} err := errors.WithStack( - r.Client.Get(ctx, client.ObjectKeyFromObject(existingUserSecret), existingUserSecret)) + r.Get(ctx, client.ObjectKeyFromObject(existingUserSecret), existingUserSecret)) if client.IgnoreNotFound(err) != nil { return err } @@ -186,7 +186,7 @@ cd $PGADMIN_DIR Name: user.PasswordRef.Name, }} err := errors.WithStack( - r.Client.Get(ctx, client.ObjectKeyFromObject(userPasswordSecret), userPasswordSecret)) + r.Get(ctx, client.ObjectKeyFromObject(userPasswordSecret), userPasswordSecret)) if err != nil { log.Error(err, "Could not get user password secret") continue diff --git a/internal/controller/standalone_pgadmin/users_test.go b/internal/controller/standalone_pgadmin/users_test.go index 9d8ef99efa..f907605ac0 100644 --- a/internal/controller/standalone_pgadmin/users_test.go +++ b/internal/controller/standalone_pgadmin/users_test.go @@ -305,7 +305,7 @@ func TestWritePGAdminUsers(t *testing.T) { secret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -365,7 +365,7 @@ func TestWritePGAdminUsers(t *testing.T) { secret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -437,7 +437,7 @@ func TestWritePGAdminUsers(t *testing.T) { secret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -482,7 +482,7 @@ func TestWritePGAdminUsers(t *testing.T) { secret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -524,7 +524,7 @@ func TestWritePGAdminUsers(t *testing.T) { // User in users.json should be unchanged secret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -551,7 +551,7 @@ func TestWritePGAdminUsers(t *testing.T) { // User in users.json should be unchanged assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -604,7 +604,7 @@ func TestWritePGAdminUsers(t *testing.T) { // have succeeded secret := &corev1.Secret{ObjectMeta: naming.StandalonePGAdmin(pgadmin)} assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -632,7 +632,7 @@ func TestWritePGAdminUsers(t *testing.T) { // User in users.json should be unchanged and attempt to add user should not // have succeeded assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -660,7 +660,7 @@ func TestWritePGAdminUsers(t *testing.T) { // User in users.json should be unchanged and attempt to add user should not // have succeeded assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) @@ -689,7 +689,7 @@ func TestWritePGAdminUsers(t *testing.T) { // User in users.json should be unchanged and attempt to add user should not // have succeeded assert.NilError(t, - reconciler.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret)) + reconciler.Get(ctx, client.ObjectKeyFromObject(secret), secret)) if assert.Check(t, secret.Data["users.json"] != nil) { var usersArr []pgAdminUserForJson assert.NilError(t, json.Unmarshal(secret.Data["users.json"], &usersArr)) diff --git a/percona/controller/pgcluster/controller_test.go b/percona/controller/pgcluster/controller_test.go index 13ac90f7aa..5f69a931c5 100644 --- a/percona/controller/pgcluster/controller_test.go +++ b/percona/controller/pgcluster/controller_test.go @@ -269,7 +269,7 @@ var _ = Describe("PMM sidecar", Ordered, func() { It("should have PMM secret hash", func() { Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(&sts), &sts)).Should(Succeed()) - Expect(sts.Spec.Template.ObjectMeta.Annotations).To(HaveKey(pNaming.AnnotationPMMSecretHash)) + Expect(sts.Spec.Template.Annotations).To(HaveKey(pNaming.AnnotationPMMSecretHash)) }) It("should label PMM secret", func() { @@ -313,7 +313,7 @@ var _ = Describe("PMM sidecar", Ordered, func() { It("should have PMM secret hash", func() { Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(&sts), &sts)).Should(Succeed()) - Expect(sts.Spec.Template.ObjectMeta.Annotations).To(HaveKey(pNaming.AnnotationPMMSecretHash)) + Expect(sts.Spec.Template.Annotations).To(HaveKey(pNaming.AnnotationPMMSecretHash)) }) It("should label PMM secret", func() { From 684acf8c0764c629ae216b467149cac2829f013e Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 16:57:52 +0500 Subject: [PATCH 13/38] linter --- .../postgrescluster/pgbackrest_test.go | 28 +++++++++---------- .../controller/postgrescluster/util_test.go | 9 +++--- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index 8b68a4a82e..082dd448d0 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -3687,15 +3687,15 @@ func TestObserveRestoreEnv(t *testing.T) { }{{ desc: "restore job and all patroni endpoints exist", createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster) { - fakeLeaderEP := &corev1.Endpoints{} + fakeLeaderEP := &corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) fakeLeaderEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeLeaderEP)) - fakeDCSEP := &corev1.Endpoints{} + fakeDCSEP := &corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeDCSEP.ObjectMeta = naming.PatroniDistributedConfiguration(cluster) fakeDCSEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeDCSEP)) - fakeFailoverEP := &corev1.Endpoints{} + fakeFailoverEP := &corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeFailoverEP.ObjectMeta = naming.PatroniTrigger(cluster) fakeFailoverEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeFailoverEP)) @@ -3711,15 +3711,15 @@ func TestObserveRestoreEnv(t *testing.T) { }, { desc: "patroni endpoints only exist", createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster) { - fakeLeaderEP := &corev1.Endpoints{} + fakeLeaderEP := &corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) fakeLeaderEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeLeaderEP)) - fakeDCSEP := &corev1.Endpoints{} + fakeDCSEP := &corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeDCSEP.ObjectMeta = naming.PatroniDistributedConfiguration(cluster) fakeDCSEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeDCSEP)) - fakeFailoverEP := &corev1.Endpoints{} + fakeFailoverEP := &corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeFailoverEP.ObjectMeta = naming.PatroniTrigger(cluster) fakeFailoverEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, fakeFailoverEP)) @@ -3892,19 +3892,19 @@ func TestPrepareForRestore(t *testing.T) { createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, ) (*batchv1.Job, []corev1.Endpoints) { - fakeLeaderEP := corev1.Endpoints{} + fakeLeaderEP := corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) fakeLeaderEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, &fakeLeaderEP)) - fakeDCSEP := corev1.Endpoints{} + fakeDCSEP := corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeDCSEP.ObjectMeta = naming.PatroniDistributedConfiguration(cluster) fakeDCSEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, &fakeDCSEP)) - fakeFailoverEP := corev1.Endpoints{} + fakeFailoverEP := corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeFailoverEP.ObjectMeta = naming.PatroniTrigger(cluster) fakeFailoverEP.Namespace = namespace assert.NilError(t, r.Client.Create(ctx, &fakeFailoverEP)) - return nil, []corev1.Endpoints{fakeLeaderEP, fakeDCSEP, fakeFailoverEP} + return nil, []corev1.Endpoints{fakeLeaderEP, fakeDCSEP, fakeFailoverEP} //nolint:staticcheck // SA1019 }, result: testResult{ restoreJobExists: false, @@ -3921,7 +3921,7 @@ func TestPrepareForRestore(t *testing.T) { createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, ) (*batchv1.Job, []corev1.Endpoints) { - return nil, []corev1.Endpoints{} + return nil, []corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code }, result: testResult{ restoreJobExists: false, @@ -3949,7 +3949,7 @@ func TestPrepareForRestore(t *testing.T) { createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, ) (*batchv1.Job, []corev1.Endpoints) { - return nil, []corev1.Endpoints{} + return nil, []corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code }, result: testResult{ restoreJobExists: false, @@ -4011,8 +4011,8 @@ func TestPrepareForRestore(t *testing.T) { naming.GenerateStartupInstance(cluster, &cluster.Spec.InstanceSets[0]).Name) } - leaderEP, dcsEP, failoverEP := corev1.Endpoints{}, corev1.Endpoints{}, corev1.Endpoints{} - currentEndpoints := []corev1.Endpoints{} + leaderEP, dcsEP, failoverEP := corev1.Endpoints{}, corev1.Endpoints{}, corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code + currentEndpoints := []corev1.Endpoints{} //nolint:staticcheck // SA1019 if err := r.Client.Get(ctx, naming.AsObjectKey(naming.PatroniLeaderEndpoints(cluster)), &leaderEP); err != nil { assert.NilError(t, client.IgnoreNotFound(err)) diff --git a/internal/controller/postgrescluster/util_test.go b/internal/controller/postgrescluster/util_test.go index 7b5af2474f..a45fe30946 100644 --- a/internal/controller/postgrescluster/util_test.go +++ b/internal/controller/postgrescluster/util_test.go @@ -229,15 +229,14 @@ func TestAddNSSWrapper(t *testing.T) { // Each container that requires the nss_wrapper envs should be updated var actualUpdatedContainerCount int for i, c := range template.Spec.Containers { - if c.Name == naming.ContainerDatabase || - c.Name == naming.PGBackRestRepoContainerName || - c.Name == naming.PGBackRestRestoreContainerName { + switch c.Name { + case naming.ContainerDatabase, naming.PGBackRestRepoContainerName, naming.PGBackRestRestoreContainerName: assert.DeepEqual(t, expectedEnv, c.Env) actualUpdatedContainerCount++ - } else if c.Name == "pgadmin" { + case "pgadmin": assert.DeepEqual(t, expectedPGAdminEnv, c.Env) actualUpdatedContainerCount++ - } else { + default: assert.DeepEqual(t, beforeAddNSS[i], c) } } From aa8659ae6d5625ec141b081fa6d29436413c5374 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 17:04:46 +0500 Subject: [PATCH 14/38] linter --- internal/controller/postgrescluster/instance.go | 6 +++--- .../controller/postgrescluster/pgbackrest.go | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/controller/postgrescluster/instance.go b/internal/controller/postgrescluster/instance.go index b2d0f25217..b2ce86842d 100644 --- a/internal/controller/postgrescluster/instance.go +++ b/internal/controller/postgrescluster/instance.go @@ -507,12 +507,12 @@ func (r *Reconciler) deleteInstances( // There are multiple instances; stop the replicas. When none are found, // requeue to try again. - result.Requeue = true + result.RequeueAfter = 1 * time.Second for i := range pods.Items { role := pods.Items[i].Labels[naming.LabelRole] if err == nil && role == naming.RolePatroniReplica { err = stop(&pods.Items[i]) - result.Requeue = false + result.RequeueAfter = 0 } // An instance without a role label is not participating in the Patroni @@ -520,7 +520,7 @@ func (r *Reconciler) deleteInstances( // stop these as well. if err == nil && len(role) == 0 { err = stop(&pods.Items[i]) - result.Requeue = false + result.RequeueAfter = 0 } } diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index a4ec79f9a3..a2c9cf8208 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -1565,7 +1565,7 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, sa, err := r.reconcilePGBackRestRBAC(ctx, postgresCluster) if err != nil { log.Error(err, "unable to create replica creation backup") - result.Requeue = true + result.RequeueAfter = 1 * time.Second return result, nil } @@ -1575,14 +1575,14 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, repoHost, err = r.reconcileDedicatedRepoHost(ctx, postgresCluster, repoResources, instances) if err != nil { log.Error(err, "unable to reconcile pgBackRest repo host") - result.Requeue = true + result.RequeueAfter = 1 * time.Second return result, nil } repoHostName = repoHost.GetName() if err := r.reconcilePGBackRestSecret(ctx, postgresCluster, repoHost, rootCA); err != nil { log.Error(err, "unable to reconcile pgBackRest secret") - result.Requeue = true + result.RequeueAfter = 1 * time.Second } // calculate hashes for the external repository configurations in the spec (e.g. for Azure, @@ -1591,7 +1591,7 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, configHashes, configHash, err := pgbackrest.CalculateConfigHashes(postgresCluster) if err != nil { log.Error(err, "unable to calculate config hashes") - result.Requeue = true + result.RequeueAfter = 1 * time.Second return result, nil } @@ -1599,7 +1599,7 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, replicaCreateRepo, err := r.reconcileRepos(ctx, postgresCluster, configHashes, repoResources) if err != nil { log.Error(err, "unable to reconcile pgBackRest repo host") - result.Requeue = true + result.RequeueAfter = 1 * time.Second return result, nil } @@ -1614,7 +1614,7 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, configHash, naming.ClusterPodService(postgresCluster).Name, postgresCluster.GetNamespace(), instanceNames); err != nil { log.Error(err, "unable to reconcile pgBackRest configuration") - result.Requeue = true + result.RequeueAfter = 1 * time.Second } // reconcile the pgBackRest stanza for all configuration pgBackRest repos @@ -1658,7 +1658,7 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, if err := r.reconcileReplicaCreateBackup(ctx, postgresCluster, instances, repoResources.replicaCreateBackupJobs, sa, configHash, replicaCreateRepo); err != nil { log.Error(err, "unable to reconcile replica creation backup") - result.Requeue = true + result.RequeueAfter = 1 * time.Second } // Reconcile a manual backup as defined in the spec, and triggered by the end-user via @@ -1666,7 +1666,7 @@ func (r *Reconciler) reconcilePGBackRest(ctx context.Context, if err := r.reconcileManualBackup(ctx, postgresCluster, repoResources.manualBackupJobs, sa, instances); err != nil { log.Error(err, "unable to reconcile manual backup") - result.Requeue = true + result.RequeueAfter = 1 * time.Second } return result, nil From e19f7c6db30e1e212e30b0fc582da38cb89c4288 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 17:15:40 +0500 Subject: [PATCH 15/38] linter --- internal/controller/pgupgrade/world.go | 4 ++-- internal/controller/pgupgrade/world_test.go | 4 ++-- internal/controller/postgrescluster/cluster.go | 4 ++-- internal/controller/postgrescluster/cluster_test.go | 2 +- internal/controller/postgrescluster/controller.go | 2 +- internal/controller/postgrescluster/patroni.go | 4 ++-- internal/controller/postgrescluster/patroni_test.go | 2 +- internal/controller/postgrescluster/pgbackrest.go | 8 ++++---- internal/controller/postgrescluster/pgbackrest_test.go | 10 +++++----- internal/pgadmin/config_test.go | 2 +- internal/pgadmin/users_test.go | 2 +- internal/pgbackrest/config_test.go | 2 +- internal/pgbackrest/pgbackrest_test.go | 2 +- internal/pgbouncer/config_test.go | 2 +- internal/pki/pki_test.go | 2 +- internal/postgres/exec_test.go | 2 +- percona/controller/pgbackup/testutils_test.go | 2 +- percona/controller/pgcluster/testutils_test.go | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/internal/controller/pgupgrade/world.go b/internal/controller/pgupgrade/world.go index 64a37a07d0..d79ba67cd9 100644 --- a/internal/controller/pgupgrade/world.go +++ b/internal/controller/pgupgrade/world.go @@ -97,7 +97,7 @@ func (w *World) populateCluster(cluster *v1beta1.PostgresCluster, err error) err return err } -func (w *World) populatePatroniEndpoints(endpoints []corev1.Endpoints) { +func (w *World) populatePatroniEndpoints(endpoints []corev1.Endpoints) { //nolint:staticcheck // SA1019 for index, endpoint := range endpoints { if endpoint.Labels[LabelPatroni] != "" { w.PatroniEndpoints = append(w.PatroniEndpoints, &endpoints[index]) @@ -164,7 +164,7 @@ type World struct { ClusterShutdown bool ReplicasExpected int - PatroniEndpoints []*corev1.Endpoints + PatroniEndpoints []*corev1.Endpoints //nolint:staticcheck // SA1019 Jobs map[string]*batchv1.Job } diff --git a/internal/controller/pgupgrade/world_test.go b/internal/controller/pgupgrade/world_test.go index 1ef489edec..408b2cca98 100644 --- a/internal/controller/pgupgrade/world_test.go +++ b/internal/controller/pgupgrade/world_test.go @@ -57,7 +57,7 @@ func TestPopulateCluster(t *testing.T) { } func TestPopulatePatroniEndpoint(t *testing.T) { - endpoints := []corev1.Endpoints{ + endpoints := []corev1.Endpoints{ //nolint:staticcheck // SA1019 { ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ @@ -85,7 +85,7 @@ func TestPopulatePatroniEndpoint(t *testing.T) { world.populatePatroniEndpoints(endpoints) // The first two have the correct labels. - assert.DeepEqual(t, world.PatroniEndpoints, []*corev1.Endpoints{ + assert.DeepEqual(t, world.PatroniEndpoints, []*corev1.Endpoints{ //nolint:staticcheck // SA1019 &endpoints[0], &endpoints[1], }) diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go index 462bc8e537..8dfa07e3d0 100644 --- a/internal/controller/postgrescluster/cluster.go +++ b/internal/controller/postgrescluster/cluster.go @@ -92,7 +92,7 @@ func (r *Reconciler) reconcileClusterPodService( // resolve to the PostgreSQL primary instance. func (r *Reconciler) generateClusterPrimaryService( cluster *v1beta1.PostgresCluster, leader *corev1.Service, -) (*corev1.Service, *corev1.Endpoints, error) { +) (*corev1.Service, *corev1.Endpoints, error) { //nolint:staticcheck // SA1019 // We want to name and label our primary Service consistently. When Patroni is // using Endpoints for its DCS, however, they and any Service that uses them // must use the same name as the Patroni "scope" which has its own constraints. @@ -118,7 +118,7 @@ func (r *Reconciler) generateClusterPrimaryService( // Endpoints for a Service have the same name as the Service. Copy labels, // annotations, and ownership, too. - endpoints := &corev1.Endpoints{} + endpoints := &corev1.Endpoints{} //nolint:staticcheck // SA1019 service.ObjectMeta.DeepCopyInto(&endpoints.ObjectMeta) endpoints.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Endpoints")) diff --git a/internal/controller/postgrescluster/cluster_test.go b/internal/controller/postgrescluster/cluster_test.go index 4d14673340..788c15d083 100644 --- a/internal/controller/postgrescluster/cluster_test.go +++ b/internal/controller/postgrescluster/cluster_test.go @@ -596,7 +596,7 @@ func TestGenerateClusterPrimaryService(t *testing.T) { _, _, err := reconciler.generateClusterPrimaryService(cluster, nil) assert.ErrorContains(t, err, "not implemented") - alwaysExpect := func(t testing.TB, service *corev1.Service, endpoints *corev1.Endpoints) { + alwaysExpect := func(t testing.TB, service *corev1.Service, endpoints *corev1.Endpoints) { //nolint:staticcheck // SA1019 assert.Assert(t, cmp.MarshalMatches(service.TypeMeta, ` apiVersion: v1 kind: Service diff --git a/internal/controller/postgrescluster/controller.go b/internal/controller/postgrescluster/controller.go index 8be626474b..7b340af4d2 100644 --- a/internal/controller/postgrescluster/controller.go +++ b/internal/controller/postgrescluster/controller.go @@ -587,7 +587,7 @@ func (r *Reconciler) SetupWithManager(mgr manager.Manager) error { bldr := builder.ControllerManagedBy(mgr). For(&v1beta1.PostgresCluster{}). Owns(&corev1.ConfigMap{}, configMapPredicate). // K8SPG-712 - Owns(&corev1.Endpoints{}). + Owns(&corev1.Endpoints{}). //nolint:staticcheck // SA1019: matches production code Owns(&corev1.PersistentVolumeClaim{}). Owns(&corev1.Secret{}). Owns(&corev1.Service{}). diff --git a/internal/controller/postgrescluster/patroni.go b/internal/controller/postgrescluster/patroni.go index 40d5b4c689..92c1e255ba 100644 --- a/internal/controller/postgrescluster/patroni.go +++ b/internal/controller/postgrescluster/patroni.go @@ -37,7 +37,7 @@ func (r *Reconciler) deletePatroniArtifacts( selector, err := naming.AsSelector(naming.ClusterPatronis(cluster)) if err == nil { err = errors.WithStack( - r.Client.DeleteAllOf(ctx, &corev1.Endpoints{}, + r.Client.DeleteAllOf(ctx, &corev1.Endpoints{}, //nolint:staticcheck // SA1019 client.InNamespace(cluster.Namespace), client.MatchingLabelsSelector{Selector: selector}, )) @@ -336,7 +336,7 @@ func (r *Reconciler) reconcilePatroniStatus( } } - dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(cluster)} + dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(cluster)} //nolint:staticcheck // SA1019 err := errors.WithStack(client.IgnoreNotFound( r.Client.Get(ctx, client.ObjectKeyFromObject(dcs), dcs))) diff --git a/internal/controller/postgrescluster/patroni_test.go b/internal/controller/postgrescluster/patroni_test.go index cf74ecc461..bf9b688c85 100644 --- a/internal/controller/postgrescluster/patroni_test.go +++ b/internal/controller/postgrescluster/patroni_test.go @@ -477,7 +477,7 @@ func TestReconcilePatroniStatus(t *testing.T) { }, } - endpoints := &corev1.Endpoints{ + endpoints := &corev1.Endpoints{ //nolint:staticcheck // SA1019: matches production code ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster), } if writeAnnotation { diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index a2c9cf8208..77f24dd141 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -1004,10 +1004,10 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P // restore Jobs and then updating pgBackRest restore status accordingly. func (r *Reconciler) observeRestoreEnv(ctx context.Context, cluster *v1beta1.PostgresCluster, -) ([]corev1.Endpoints, *batchv1.Job, error) { +) ([]corev1.Endpoints, *batchv1.Job, error) { //nolint:staticcheck // SA1019 // lookup the various patroni endpoints - leaderEP, dcsEP, failoverEP := corev1.Endpoints{}, corev1.Endpoints{}, corev1.Endpoints{} - currentEndpoints := []corev1.Endpoints{} + leaderEP, dcsEP, failoverEP := corev1.Endpoints{}, corev1.Endpoints{}, corev1.Endpoints{} //nolint:staticcheck // SA1019 + currentEndpoints := []corev1.Endpoints{} //nolint:staticcheck // SA1019 if err := r.Client.Get(ctx, naming.AsObjectKey(naming.PatroniLeaderEndpoints(cluster)), &leaderEP); err != nil { if !apierrors.IsNotFound(err) { @@ -1130,7 +1130,7 @@ func (r *Reconciler) observeRestoreEnv(ctx context.Context, // cluster to re-bootstrap using a restored data directory. func (r *Reconciler) prepareForRestore(ctx context.Context, cluster *v1beta1.PostgresCluster, observed *observedInstances, - currentEndpoints []corev1.Endpoints, restoreJob *batchv1.Job, restoreID string, + currentEndpoints []corev1.Endpoints, restoreJob *batchv1.Job, restoreID string, //nolint:staticcheck // SA1019 ) error { setPreparingClusterCondition := func(resource string) { meta.SetStatusCondition(&cluster.Status.Conditions, metav1.Condition{ diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index 082dd448d0..d6e0f763e1 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -3865,14 +3865,14 @@ func TestPrepareForRestore(t *testing.T) { for _, dedicated := range []bool{true, false} { testCases := []struct { desc string - createResources func(t *testing.T, cluster *v1beta1.PostgresCluster) (*batchv1.Job, []corev1.Endpoints) + createResources func(t *testing.T, cluster *v1beta1.PostgresCluster) (*batchv1.Job, []corev1.Endpoints) //nolint:staticcheck // SA1019: matches production code fakeObserved *observedInstances result testResult }{{ desc: "remove restore jobs", createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, - ) (*batchv1.Job, []corev1.Endpoints) { + ) (*batchv1.Job, []corev1.Endpoints) { //nolint:staticcheck // SA1019: matches production code job := generateJob(cluster.Name) assert.NilError(t, r.Client.Create(ctx, job)) return job, nil @@ -3891,7 +3891,7 @@ func TestPrepareForRestore(t *testing.T) { desc: "remove patroni endpoints", createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, - ) (*batchv1.Job, []corev1.Endpoints) { + ) (*batchv1.Job, []corev1.Endpoints) { //nolint:staticcheck // SA1019: matches production code fakeLeaderEP := corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code fakeLeaderEP.ObjectMeta = naming.PatroniLeaderEndpoints(cluster) fakeLeaderEP.Namespace = namespace @@ -3920,7 +3920,7 @@ func TestPrepareForRestore(t *testing.T) { desc: "cluster fully prepared", createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, - ) (*batchv1.Job, []corev1.Endpoints) { + ) (*batchv1.Job, []corev1.Endpoints) { //nolint:staticcheck // SA1019: matches production code return nil, []corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code }, result: testResult{ @@ -3948,7 +3948,7 @@ func TestPrepareForRestore(t *testing.T) { }}, createResources: func(t *testing.T, cluster *v1beta1.PostgresCluster, - ) (*batchv1.Job, []corev1.Endpoints) { + ) (*batchv1.Job, []corev1.Endpoints) { //nolint:staticcheck // SA1019: matches production code return nil, []corev1.Endpoints{} //nolint:staticcheck // SA1019: matches production code }, result: testResult{ diff --git a/internal/pgadmin/config_test.go b/internal/pgadmin/config_test.go index 0b96af6721..af63faca25 100644 --- a/internal/pgadmin/config_test.go +++ b/internal/pgadmin/config_test.go @@ -94,7 +94,7 @@ func TestStartupCommand(t *testing.T) { // Expect flake8 to be happy. Ignore "E401 multiple imports on one line" // in addition to the defaults. The file contents appear in PodSpec, so // allow lines longer than the default to save some vertical space. - cmd := exec.Command(flake8, "--extend-ignore=E401", "--max-line-length=99", file) + cmd := exec.CommandContext(context.Background(), flake8, "--extend-ignore=E401", "--max-line-length=99", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) }) diff --git a/internal/pgadmin/users_test.go b/internal/pgadmin/users_test.go index 9ba088b6fb..0fe583b2b8 100644 --- a/internal/pgadmin/users_test.go +++ b/internal/pgadmin/users_test.go @@ -179,7 +179,7 @@ with create_app().app_context(): // Expect flake8 to be happy. Ignore "E402 module level import not // at top of file" in addition to the defaults. - cmd := exec.Command(flake8, "--extend-ignore=E402", file) + cmd := exec.CommandContext(context.Background(), flake8, "--extend-ignore=E402", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) diff --git a/internal/pgbackrest/config_test.go b/internal/pgbackrest/config_test.go index c0643edffd..1feb50fdee 100644 --- a/internal/pgbackrest/config_test.go +++ b/internal/pgbackrest/config_test.go @@ -389,7 +389,7 @@ func TestDedicatedSnapshotVolumeRestoreCommand(t *testing.T) { file := filepath.Join(dir, "script.bash") assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600)) - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/pgbackrest/pgbackrest_test.go b/internal/pgbackrest/pgbackrest_test.go index 12bc8facc4..520a2516a6 100644 --- a/internal/pgbackrest/pgbackrest_test.go +++ b/internal/pgbackrest/pgbackrest_test.go @@ -92,7 +92,7 @@ fi assert.NilError(t, os.WriteFile(file, []byte(shellCheckScript), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/pgbouncer/config_test.go b/internal/pgbouncer/config_test.go index 42c93bc6fd..3348dfb8b2 100644 --- a/internal/pgbouncer/config_test.go +++ b/internal/pgbouncer/config_test.go @@ -351,7 +351,7 @@ func TestReloadCommand(t *testing.T) { assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) //nolint:noctx //test data + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/pki/pki_test.go b/internal/pki/pki_test.go index 287f568667..ecd5effad6 100644 --- a/internal/pki/pki_test.go +++ b/internal/pki/pki_test.go @@ -487,7 +487,7 @@ func strictOpenSSLVerify(t *testing.T, openssl string, root, leaf Certificate) { verify := func(t testing.TB, args ...string) { t.Helper() // #nosec G204 -- args from this test - cmd := exec.Command(openssl, append([]string{"verify", + cmd := exec.CommandContext(context.Background(), openssl, append([]string{"verify", // Do not use the default trusted CAs. "-no-CAfile", "-no-CApath", // Disable "non-compliant workarounds for broken certificates". diff --git a/internal/postgres/exec_test.go b/internal/postgres/exec_test.go index d6be8a0384..00890b9980 100644 --- a/internal/postgres/exec_test.go +++ b/internal/postgres/exec_test.go @@ -184,7 +184,7 @@ done <<< "${databases}" assert.NilError(t, os.WriteFile(file, []byte(script), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) diff --git a/percona/controller/pgbackup/testutils_test.go b/percona/controller/pgbackup/testutils_test.go index fa57fcb9b8..ca7a59592c 100644 --- a/percona/controller/pgbackup/testutils_test.go +++ b/percona/controller/pgbackup/testutils_test.go @@ -41,7 +41,7 @@ func buildFakeClient(ctx context.Context, cr *v2.PerconaPGCluster, objs ...clien } objs = append(objs, postgresCluster) - dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster)} + dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster)} //nolint:staticcheck // SA1019: matches production code dcs.Annotations = map[string]string{ "initialize": "system-identifier", } diff --git a/percona/controller/pgcluster/testutils_test.go b/percona/controller/pgcluster/testutils_test.go index 12a00bef18..6df9c3828b 100644 --- a/percona/controller/pgcluster/testutils_test.go +++ b/percona/controller/pgcluster/testutils_test.go @@ -185,7 +185,7 @@ func buildFakeClient(ctx context.Context, cr *v2.PerconaPGCluster, objs ...clien } objs = append(objs, postgresCluster) - dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster)} + dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(postgresCluster)} //nolint:staticcheck // SA1019: matches production code dcs.Annotations = map[string]string{ "initialize": "system-identifier", } From 8ae5f9bc2c5b8c02f6f1985d02cdf9f55a31ffec Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 17:17:59 +0500 Subject: [PATCH 16/38] linter --- internal/pgadmin/config_test.go | 1 + internal/pki/pki_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/pgadmin/config_test.go b/internal/pgadmin/config_test.go index af63faca25..b038585920 100644 --- a/internal/pgadmin/config_test.go +++ b/internal/pgadmin/config_test.go @@ -5,6 +5,7 @@ package pgadmin import ( + "context" "os" "os/exec" "path/filepath" diff --git a/internal/pki/pki_test.go b/internal/pki/pki_test.go index ecd5effad6..729c9e30d8 100644 --- a/internal/pki/pki_test.go +++ b/internal/pki/pki_test.go @@ -5,6 +5,7 @@ package pki import ( + "context" "crypto/ecdsa" "crypto/x509" "os" From 618352c195bb95167aa571f59489a2adf3c761fa Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 17:46:07 +0500 Subject: [PATCH 17/38] linter --- .../controller/postgrescluster/apply_test.go | 26 +++++++++---------- .../postgrescluster/cluster_test.go | 4 +-- .../postgrescluster/instance_test.go | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/controller/postgrescluster/apply_test.go b/internal/controller/postgrescluster/apply_test.go index d76149a243..edfd4498f8 100644 --- a/internal/controller/postgrescluster/apply_test.go +++ b/internal/controller/postgrescluster/apply_test.go @@ -55,7 +55,7 @@ func TestServerSideApply(t *testing.T) { // Create the object. before := constructor() - assert.NilError(t, cc.Patch(ctx, before, client.Apply, reconciler.Owner)) + assert.NilError(t, cc.Patch(ctx, before, client.Apply, reconciler.Owner)) //nolint:staticcheck assert.Assert(t, before.GetResourceVersion() != "") // Allow the Kubernetes API clock to advance. @@ -63,7 +63,7 @@ func TestServerSideApply(t *testing.T) { // client.Apply changes the ResourceVersion inadvertently. after := constructor() - assert.NilError(t, cc.Patch(ctx, after, client.Apply, reconciler.Owner)) + assert.NilError(t, cc.Patch(ctx, after, client.Apply, reconciler.Owner)) //nolint:staticcheck assert.Assert(t, after.GetResourceVersion() != "") switch { @@ -115,7 +115,7 @@ func TestServerSideApply(t *testing.T) { assert.NilError(t, controllerutil.SetControllerReference(controller2, applied, cc.Scheme())) - err1 := cc.Patch(ctx, applied, client.Apply, client.ForceOwnership, reconciler.Owner) + err1 := cc.Patch(ctx, applied, client.Apply, client.ForceOwnership, reconciler.Owner) //nolint:staticcheck // Patch not accepted; the ownerReferences field is invalid. assert.Assert(t, apierrors.IsInvalid(err1), "got %#v", err1) @@ -167,13 +167,13 @@ func TestServerSideApply(t *testing.T) { switch { case serverVersion.LessThan(version.MustParseGeneric("1.22")): assert.ErrorContains(t, - cc.Patch(ctx, upstream, client.Apply, client.ForceOwnership, reconciler.Owner), + cc.Patch(ctx, upstream, client.Apply, client.ForceOwnership, reconciler.Owner), //nolint:staticcheck "field not declared in schema", "expected https://issue.k8s.io/109210") default: assert.NilError(t, - cc.Patch(ctx, upstream, client.Apply, client.ForceOwnership, reconciler.Owner)) + cc.Patch(ctx, upstream, client.Apply, client.ForceOwnership, reconciler.Owner)) //nolint:staticcheck } // Our apply method generates the correct apply-patch. @@ -201,7 +201,7 @@ func TestServerSideApply(t *testing.T) { // Create the Service. before := intent.DeepCopy() assert.NilError(t, - cc.Patch(ctx, before, client.Apply, client.ForceOwnership, reconciler.Owner)) + cc.Patch(ctx, before, client.Apply, client.ForceOwnership, reconciler.Owner)) //nolint:staticcheck // Something external mucks it up. assert.NilError(t, @@ -212,7 +212,7 @@ func TestServerSideApply(t *testing.T) { // client.Apply cannot correct it in old versions of Kubernetes. after := intent.DeepCopy() assert.NilError(t, - cc.Patch(ctx, after, client.Apply, client.ForceOwnership, reconciler.Owner)) + cc.Patch(ctx, after, client.Apply, client.ForceOwnership, reconciler.Owner)) //nolint:staticcheck switch { case serverVersion.LessThan(version.MustParseGeneric("1.22")): @@ -242,8 +242,8 @@ func TestServerSideApply(t *testing.T) { assert.Equal(t, managed.Operation, metav1.ManagedFieldsOperationApply) assert.Assert(t, managed.FieldsV1 != nil) - assert.Assert(t, strings.Contains(string(managed.FieldsV1.Raw), `"f:selector":{`), - "expected f:selector in %s", managed.FieldsV1.Raw) + assert.Assert(t, strings.Contains(managed.FieldsV1.GetRawString(), `"f:selector":{`), + "expected f:selector in %s", managed.FieldsV1.GetRawString()) }) for _, tt := range []struct { @@ -262,7 +262,7 @@ func TestServerSideApply(t *testing.T) { // Create the Service. before := intent.DeepCopy() assert.NilError(t, - cc.Patch(ctx, before, client.Apply, client.ForceOwnership, reconciler.Owner)) + cc.Patch(ctx, before, client.Apply, client.ForceOwnership, reconciler.Owner)) //nolint:staticcheck // Something external mucks it up. assert.NilError(t, @@ -273,7 +273,7 @@ func TestServerSideApply(t *testing.T) { // client.Apply cannot correct it. after := intent.DeepCopy() assert.NilError(t, - cc.Patch(ctx, after, client.Apply, client.ForceOwnership, reconciler.Owner)) + cc.Patch(ctx, after, client.Apply, client.ForceOwnership, reconciler.Owner)) //nolint:staticcheck assert.Assert(t, len(after.Spec.Selector) != len(intent.Spec.Selector), "got %v", after.Spec.Selector) @@ -300,8 +300,8 @@ func TestServerSideApply(t *testing.T) { // The selector field is forgotten, however. assert.Assert(t, managed.FieldsV1 != nil) - assert.Assert(t, !strings.Contains(string(managed.FieldsV1.Raw), `"f:selector":{`), - "expected f:selector to be missing from %s", managed.FieldsV1.Raw) + assert.Assert(t, !strings.Contains(managed.FieldsV1.GetRawString(), `"f:selector":{`), + "expected f:selector to be missing from %s", managed.FieldsV1.GetRawString()) }) } }) diff --git a/internal/controller/postgrescluster/cluster_test.go b/internal/controller/postgrescluster/cluster_test.go index 788c15d083..ffea809603 100644 --- a/internal/controller/postgrescluster/cluster_test.go +++ b/internal/controller/postgrescluster/cluster_test.go @@ -101,7 +101,7 @@ func TestCustomLabels(t *testing.T) { NamespacedName: client.ObjectKeyFromObject(cluster), }) assert.NilError(t, err) - assert.Assert(t, result.Requeue == false) + assert.Assert(t, result.RequeueAfter == 0) } getUnstructuredLabels := func(t *testing.T, cluster *v1beta1.PostgresCluster, u *unstructured.Unstructured) map[string]map[string]string { @@ -351,7 +351,7 @@ func TestCustomAnnotations(t *testing.T) { NamespacedName: client.ObjectKeyFromObject(cluster), }) assert.NilError(t, err) - assert.Assert(t, result.Requeue == false) + assert.Assert(t, result.RequeueAfter == 0) } getUnstructuredAnnotations := func(t *testing.T, cluster *v1beta1.PostgresCluster, u *unstructured.Unstructured) map[string]map[string]string { diff --git a/internal/controller/postgrescluster/instance_test.go b/internal/controller/postgrescluster/instance_test.go index 7897d5e382..69888f22b9 100644 --- a/internal/controller/postgrescluster/instance_test.go +++ b/internal/controller/postgrescluster/instance_test.go @@ -1364,7 +1364,7 @@ func TestDeleteInstance(t *testing.T) { NamespacedName: client.ObjectKeyFromObject(cluster), }) assert.NilError(t, err) - assert.Assert(t, result.Requeue == false) + assert.Assert(t, result.RequeueAfter == 0) stsList := &appsv1.StatefulSetList{} assert.NilError(t, reconciler.Client.List(ctx, stsList, From c110cef4c6b0cfdab2d07358fc25543fc45c887b Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 17:54:40 +0500 Subject: [PATCH 18/38] linter --- internal/bridge/crunchybridgecluster/apply.go | 3 ++- internal/bridge/installation.go | 3 ++- internal/controller/pgupgrade/apply.go | 3 ++- internal/controller/postgrescluster/apply.go | 3 ++- internal/controller/standalone_pgadmin/apply.go | 3 ++- internal/upgradecheck/header.go | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/bridge/crunchybridgecluster/apply.go b/internal/bridge/crunchybridgecluster/apply.go index 01d9de59e6..49195d1291 100644 --- a/internal/bridge/crunchybridgecluster/apply.go +++ b/internal/bridge/crunchybridgecluster/apply.go @@ -8,6 +8,7 @@ import ( "context" "reflect" + "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -36,7 +37,7 @@ func (r *CrunchyBridgeClusterReconciler) apply(ctx context.Context, object clien // Generate an apply-patch by comparing the object to its zero value. zero := reflect.New(reflect.TypeOf(object).Elem()).Interface() data, err := client.MergeFrom(zero.(client.Object)).Data(object) - apply := client.RawPatch(client.Apply.Type(), data) + apply := client.RawPatch(types.ApplyPatchType, data) // Send the apply-patch with force=true. if err == nil { diff --git a/internal/bridge/installation.go b/internal/bridge/installation.go index bddbfefe8d..10ef19b0d0 100644 --- a/internal/bridge/installation.go +++ b/internal/bridge/installation.go @@ -14,6 +14,7 @@ import ( corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" corev1apply "k8s.io/client-go/applyconfigurations/core/v1" "sigs.k8s.io/controller-runtime/pkg/builder" @@ -192,7 +193,7 @@ func (r *InstallationReconciler) persist( ctx context.Context, config *corev1apply.SecretApplyConfiguration, ) error { data, err := json.Marshal(config) - apply := client.RawPatch(client.Apply.Type(), data) + apply := client.RawPatch(types.ApplyPatchType, data) // [client.Client] decides where to write by looking at the underlying type, // namespace, and name of its [client.Object] argument. That is also where diff --git a/internal/controller/pgupgrade/apply.go b/internal/controller/pgupgrade/apply.go index 71cf65cd4f..88880e15dd 100644 --- a/internal/controller/pgupgrade/apply.go +++ b/internal/controller/pgupgrade/apply.go @@ -8,6 +8,7 @@ import ( "context" "reflect" + "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -32,7 +33,7 @@ func (r *PGUpgradeReconciler) apply(ctx context.Context, object client.Object) e // Generate an apply-patch by comparing the object to its zero value. zero := reflect.New(reflect.TypeOf(object).Elem()).Interface() data, err := client.MergeFrom(zero.(client.Object)).Data(object) - apply := client.RawPatch(client.Apply.Type(), data) + apply := client.RawPatch(types.ApplyPatchType, data) // Send the apply-patch with force=true. if err == nil { diff --git a/internal/controller/postgrescluster/apply.go b/internal/controller/postgrescluster/apply.go index e54b1918a5..01697733ae 100644 --- a/internal/controller/postgrescluster/apply.go +++ b/internal/controller/postgrescluster/apply.go @@ -10,6 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" + "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/percona/percona-postgresql-operator/v3/internal/kubeapi" @@ -24,7 +25,7 @@ func (r *Reconciler) apply(ctx context.Context, object client.Object) error { // Generate an apply-patch by comparing the object to its zero value. zero := reflect.New(reflect.TypeOf(object).Elem()).Interface() data, err := client.MergeFrom(zero.(client.Object)).Data(object) - apply := client.RawPatch(client.Apply.Type(), data) + apply := client.RawPatch(types.ApplyPatchType, data) // Keep a copy of the object before any API calls. intent := object.DeepCopyObject() diff --git a/internal/controller/standalone_pgadmin/apply.go b/internal/controller/standalone_pgadmin/apply.go index fc6d3ffb3d..be72f04a75 100644 --- a/internal/controller/standalone_pgadmin/apply.go +++ b/internal/controller/standalone_pgadmin/apply.go @@ -8,6 +8,7 @@ import ( "context" "reflect" + "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -36,7 +37,7 @@ func (r *PGAdminReconciler) apply(ctx context.Context, object client.Object) err // Generate an apply-patch by comparing the object to its zero value. zero := reflect.New(reflect.TypeOf(object).Elem()).Interface() data, err := client.MergeFrom(zero.(client.Object)).Data(object) - apply := client.RawPatch(client.Apply.Type(), data) + apply := client.RawPatch(types.ApplyPatchType, data) // Send the apply-patch with force=true. if err == nil { diff --git a/internal/upgradecheck/header.go b/internal/upgradecheck/header.go index 2675edd386..8191d1d245 100644 --- a/internal/upgradecheck/header.go +++ b/internal/upgradecheck/header.go @@ -13,6 +13,7 @@ import ( googleuuid "github.com/google/uuid" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/client-go/discovery" "k8s.io/client-go/rest" @@ -150,7 +151,7 @@ func applyConfigMap(ctx context.Context, crClient crclient.Client, data, err := crclient.MergeFrom(zero).Data(object) if err == nil { - apply := crclient.RawPatch(crclient.Apply.Type(), data) + apply := crclient.RawPatch(types.ApplyPatchType, data) err = crClient.Patch(ctx, object, apply, []crclient.PatchOption{crclient.ForceOwnership, crclient.FieldOwner(owner)}...) } From dbbc78e35f420aff09a4db343a94380a15ecd524 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:06:21 +0500 Subject: [PATCH 19/38] linter --- internal/controller/postgrescluster/controller.go | 5 ++--- internal/controller/postgrescluster/pgbackrest_test.go | 1 + internal/upgradecheck/helpers_test.go | 2 +- percona/watcher/wal_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/controller/postgrescluster/controller.go b/internal/controller/postgrescluster/controller.go index 7b340af4d2..bbfb35c6f0 100644 --- a/internal/controller/postgrescluster/controller.go +++ b/internal/controller/postgrescluster/controller.go @@ -438,9 +438,8 @@ func (r *Reconciler) Reconcile( if err == nil { var next reconcile.Result if next, err = r.reconcilePGBackRest(ctx, cluster, - instances, rootCA, backupsSpecFound); err == nil && !next.IsZero() { - result.Requeue = result.Requeue || next.Requeue - if next.RequeueAfter > 0 { + instances, rootCA, backupsSpecFound); err == nil && next.RequeueAfter > 0 { + if result.RequeueAfter == 0 || next.RequeueAfter < result.RequeueAfter { result.RequeueAfter = next.RequeueAfter } } diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index d6e0f763e1..544404b206 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 +//nolint:staticcheck // SA1019: uses deprecated APIs that match production code package postgrescluster import ( diff --git a/internal/upgradecheck/helpers_test.go b/internal/upgradecheck/helpers_test.go index a86e54377c..a4fe4a2949 100644 --- a/internal/upgradecheck/helpers_test.go +++ b/internal/upgradecheck/helpers_test.go @@ -77,7 +77,7 @@ func setupDeploymentID(t *testing.T) string { // setupFakeClientWithPGOScheme returns a fake client with the PGO scheme added; // if `includeCluster` is true, also adds some empty PostgresCluster and CrunchyBridgeCluster // items to the client -func setupFakeClientWithPGOScheme(t *testing.T, includeCluster bool) crclient.Client { +func setupFakeClientWithPGOScheme(t *testing.T, includeCluster bool) crclient.Client { //nolint:unparam t.Helper() if includeCluster { pc := &v1beta1.PostgresClusterList{ diff --git a/percona/watcher/wal_test.go b/percona/watcher/wal_test.go index e97450dd6f..a54b7181bc 100644 --- a/percona/watcher/wal_test.go +++ b/percona/watcher/wal_test.go @@ -16,7 +16,7 @@ import ( pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" ) -func mustParseTime(layout string, value string) time.Time { +func mustParseTime(layout string, value string) time.Time { //nolint:unparam time, err := time.Parse(layout, value) if err != nil { panic(err) From 8c1941466f7cc11d79e58601e3fd538344be6a06 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:10:45 +0500 Subject: [PATCH 20/38] linter --- internal/pgadmin/config_test.go | 2 +- internal/pgbackrest/config_test.go | 2 +- internal/pki/pki_test.go | 4 ++-- internal/postgres/password/md5.go | 2 +- percona/controller/pgcluster/controller.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/pgadmin/config_test.go b/internal/pgadmin/config_test.go index b038585920..313916a3e6 100644 --- a/internal/pgadmin/config_test.go +++ b/internal/pgadmin/config_test.go @@ -78,7 +78,7 @@ func TestStartupCommand(t *testing.T) { assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600)) // Expect shellcheck to be happy. - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) }) diff --git a/internal/pgbackrest/config_test.go b/internal/pgbackrest/config_test.go index 1feb50fdee..3d9150bac1 100644 --- a/internal/pgbackrest/config_test.go +++ b/internal/pgbackrest/config_test.go @@ -349,7 +349,7 @@ func TestRestoreCommand(t *testing.T) { file := filepath.Join(dir, "script.bash") assert.NilError(t, os.WriteFile(file, []byte(command[3]), 0o600)) - cmd := exec.Command(shellcheck, "--enable=all", file) + cmd := exec.CommandContext(context.Background(), shellcheck, "--enable=all", file) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) } diff --git a/internal/pki/pki_test.go b/internal/pki/pki_test.go index 729c9e30d8..46c5d0c6ea 100644 --- a/internal/pki/pki_test.go +++ b/internal/pki/pki_test.go @@ -440,7 +440,7 @@ func basicOpenSSLVerify(t *testing.T, openssl string, root, leaf Certificate) { verify := func(t testing.TB, args ...string) { t.Helper() // #nosec G204 -- args from this test - cmd := exec.Command(openssl, append([]string{"verify"}, args...)...) + cmd := exec.CommandContext(context.Background(), openssl, append([]string{"verify"}, args...)...) output, err := cmd.CombinedOutput() assert.NilError(t, err, "%q\n%s", cmd.Args, output) @@ -477,7 +477,7 @@ func basicOpenSSLVerify(t *testing.T, openssl string, root, leaf Certificate) { } func strictOpenSSLVerify(t *testing.T, openssl string, root, leaf Certificate) { - output, _ := exec.Command(openssl, "verify", "-help").CombinedOutput() + output, _ := exec.CommandContext(context.Background(), openssl, "verify", "-help").CombinedOutput() if !strings.Contains(string(output), "-x509_strict") { t.Skip(`requires "-x509_strict" flag`) } diff --git a/internal/postgres/password/md5.go b/internal/postgres/password/md5.go index 21afcaa2a5..c49eac9e9a 100644 --- a/internal/postgres/password/md5.go +++ b/internal/postgres/password/md5.go @@ -5,7 +5,7 @@ package password import ( - "crypto/md5" + "crypto/md5" //nolint:gosec "fmt" "github.com/pkg/errors" diff --git a/percona/controller/pgcluster/controller.go b/percona/controller/pgcluster/controller.go index 2e554720c9..f4e3b8720f 100644 --- a/percona/controller/pgcluster/controller.go +++ b/percona/controller/pgcluster/controller.go @@ -2,7 +2,7 @@ package pgcluster import ( "context" - "crypto/md5" + "crypto/md5" //nolint:gosec "fmt" "io" "reflect" From 82786c4007d2d97acb9eb5af5f4796418cb561b2 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:11:30 +0500 Subject: [PATCH 21/38] linter --- internal/controller/postgrescluster/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go index 8dfa07e3d0..1997396c38 100644 --- a/internal/controller/postgrescluster/cluster.go +++ b/internal/controller/postgrescluster/cluster.go @@ -141,7 +141,7 @@ func (r *Reconciler) generateClusterPrimaryService( }} // Resolve to the ClusterIP for which Patroni has configured the Endpoints. - endpoints.Subsets = []corev1.EndpointSubset{{ + endpoints.Subsets = []corev1.EndpointSubset{{ //nolint:staticcheck // SA1019 Addresses: []corev1.EndpointAddress{{IP: leader.Spec.ClusterIP}}, }} From d3f5f0b94635980eda80fd4eccfbce1a6b767c51 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:12:52 +0500 Subject: [PATCH 22/38] linter --- percona/controller/pgcluster/testutils_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/percona/controller/pgcluster/testutils_test.go b/percona/controller/pgcluster/testutils_test.go index 6df9c3828b..0f2c7ffb5f 100644 --- a/percona/controller/pgcluster/testutils_test.go +++ b/percona/controller/pgcluster/testutils_test.go @@ -157,14 +157,14 @@ type fakeClient struct { var _ = client.Client(new(fakeClient)) func (f *fakeClient) Patch(ctx context.Context, obj client.Object, patch client.Patch, options ...client.PatchOption) error { - err := f.Patch(ctx, obj, patch, options...) + err := f.Client.Patch(ctx, obj, patch, options...) if !k8serrors.IsNotFound(err) { return err } if err := f.Create(ctx, obj); err != nil { return err } - return f.Patch(ctx, obj, patch, options...) + return f.Client.Patch(ctx, obj, patch, options...) } func buildFakeClient(ctx context.Context, cr *v2.PerconaPGCluster, objs ...client.Object) (client.Client, error) { From 1f27d6e1af956c322b0860d7dabb97299fd36941 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:43:07 +0500 Subject: [PATCH 23/38] linter & shellcheck --- cmd/postgres-operator/main.go | 6 +++--- hack/create-todo-patch.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/postgres-operator/main.go b/cmd/postgres-operator/main.go index fae2dd3ebd..a96fc1eca6 100644 --- a/cmd/postgres-operator/main.go +++ b/cmd/postgres-operator/main.go @@ -161,7 +161,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error { Client: mgr.GetClient(), Scheme: mgr.GetScheme(), Owner: postgrescluster.ControllerName, - Recorder: mgr.GetEventRecorderFor(postgrescluster.ControllerName), + Recorder: mgr.GetEventRecorderFor(postgrescluster.ControllerName), //nolint:staticcheck Tracer: otel.Tracer(postgrescluster.ControllerName), IsOpenShift: isOpenshift(ctx, mgr.GetConfig()), CertManagerCtrlFunc: certmanager.NewController, @@ -191,7 +191,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error { pc := &pgcluster.PGClusterReconciler{ Client: mgr.GetClient(), Owner: pgcluster.PGClusterControllerName, - Recorder: mgr.GetEventRecorderFor(pgcluster.PGClusterControllerName), + Recorder: mgr.GetEventRecorderFor(pgcluster.PGClusterControllerName), //nolint:staticcheck Tracer: otel.Tracer(pgcluster.PGClusterControllerName), Platform: detectPlatform(ctx, mgr.GetConfig()), KubeVersion: getServerVersion(ctx, mgr.GetConfig()), @@ -245,7 +245,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error { pr := &pgrestore.PGRestoreReconciler{ Client: mgr.GetClient(), Owner: pgrestore.PGRestoreControllerName, - Recorder: mgr.GetEventRecorderFor(pgrestore.PGRestoreControllerName), + Recorder: mgr.GetEventRecorderFor(pgrestore.PGRestoreControllerName), //nolint:staticcheck Tracer: otel.Tracer(pgrestore.PGRestoreControllerName), } if err := pr.SetupWithManager(mgr); err != nil { diff --git a/hack/create-todo-patch.sh b/hack/create-todo-patch.sh index 7e5934d629..59cbf89710 100755 --- a/hack/create-todo-patch.sh +++ b/hack/create-todo-patch.sh @@ -36,9 +36,11 @@ name_desc_with_todo=$( .spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.customTLSSecret.properties.name.description \ "${clusters_dir}/generated/upstream.pgv3.percona.com_postgresclusters.yaml" ) +# shellcheck disable=SC2001 name_desc_without_todo=$(sed 's/ TODO.*//g' <<< "${name_desc_with_todo}") # Generate a JSON patch file to update the "name" description for all applicable paths in the CRD. +# shellcheck disable=SC2016 python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_without_todo}" ' [{ op: "add", path: "/work", value: $new }] + [paths(select(. == $old)) | { op: "copy", from: "/work", path: "/\(map(tostring) | join("/"))" }] + @@ -46,6 +48,7 @@ python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_witho ' \ "${clusters_dir}/generated/upstream.pgv3.percona.com_postgresclusters.yaml" > "${clusters_dir}/todos.yaml" +# shellcheck disable=SC2016 python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_without_todo}" ' [{ op: "add", path: "/work", value: $new }] + [paths(select(. == $old)) | { op: "copy", from: "/work", path: "/\(map(tostring) | join("/"))" }] + From 50116ca96b23d45b058aa555446e21a00534aa02 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:47:55 +0500 Subject: [PATCH 24/38] upd Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5b5bd38c32..970f450b84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -511,7 +511,7 @@ pipeline { -e GO111MODULE=on \ golang:1.26.0 sh -c ' go install github.com/google/go-licenses@latest; - /go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/v2/cmd/postgres-operator \ + /go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/v3/cmd/postgres-operator \ | cut -d , -f 3 \ | sort -u \ > go-licenses-new || : From 32bc51e754c363d2f9e13e7f7b811ac3aaff6580 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 18:52:28 +0500 Subject: [PATCH 25/38] upd reviewdog.yml --- .github/workflows/reviewdog.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 4e5d407c41..78911be62a 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -82,6 +82,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + with: + fetch-depth: 0 - uses: reviewdog/action-alex@347481655add010a2ae302df34b57c9bcfa0d6e4 # v1 with: github_token: ${{ secrets.github_token }} From 89bf8b66c0eba5a2d7b984d62ac7b045511ef0fb Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 15 Jul 2026 19:05:44 +0500 Subject: [PATCH 26/38] linter --- cmd/postgres-operator/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/postgres-operator/main.go b/cmd/postgres-operator/main.go index a96fc1eca6..383ee70461 100644 --- a/cmd/postgres-operator/main.go +++ b/cmd/postgres-operator/main.go @@ -271,7 +271,7 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error { pgAdminReconciler := &standalone_pgadmin.PGAdminReconciler{ Client: mgr.GetClient(), Owner: "pgadmin-controller", - Recorder: mgr.GetEventRecorderFor(naming.ControllerPGAdmin), + Recorder: mgr.GetEventRecorderFor(naming.ControllerPGAdmin), //nolint:staticcheck IsOpenShift: isOpenshift(ctx, mgr.GetConfig()), } From ea8c7799d9fcbed584d2c87cabdda3437d4eb562 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Thu, 16 Jul 2026 17:08:40 +0500 Subject: [PATCH 27/38] fix flaky test --- e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml index ac7393f344..49cccd600e 100644 --- a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml @@ -31,7 +31,8 @@ commands: kubectl wait -n $NAMESPACE --timeout 180s --for=jsonpath='{.spec.template.spec.containers[0].image}'=$target_image_backrest sts/upgrade-minor-repo-host kubectl wait -n $NAMESPACE --timeout 180s --for=jsonpath='{.spec.template.spec.containers[0].image}'=$target_image_pgbouncer deployment/upgrade-minor-pgbouncer - for s in $(kubectl get sts --no-headers -l postgres-operator.crunchydata.com/instance-set=instance1 --output=custom-columns='NAME:.metadata.name'); do + for s in $(kubectl get sts -n $NAMESPACE --no-headers -l postgres-operator.crunchydata.com/instance-set=instance1 --output=custom-columns='NAME:.metadata.name'); do kubectl wait -n $NAMESPACE --timeout 180s --for=jsonpath='{.spec.template.spec.containers[0].image}'=$target_image_postgresql sts/${s} done timeout: 180 + From 4d80307154e33ce76a8bc9f2594b5439e00706b9 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Thu, 16 Jul 2026 18:03:01 +0500 Subject: [PATCH 28/38] fix upgrade test --- e2e-tests/tests/upgrade-minor/00-assert.yaml | 33 ++++++++------------ e2e-tests/tests/upgrade-minor/01-assert.yaml | 14 ++++----- e2e-tests/tests/upgrade-minor/04-assert.yaml | 33 ++++++++------------ 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/e2e-tests/tests/upgrade-minor/00-assert.yaml b/e2e-tests/tests/upgrade-minor/00-assert.yaml index c35ff62c91..50ac646d0d 100644 --- a/e2e-tests/tests/upgrade-minor/00-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/00-assert.yaml @@ -1,24 +1,17 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: perconapgclusters.pgv3.percona.com -spec: - group: pgv3.percona.com - names: - kind: PerconaPGCluster - listKind: PerconaPGClusterList - plural: perconapgclusters - singular: perconapgcluster - scope: Namespaced ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -metadata: - name: check-operator-deploy-status -timeout: 120 commands: - - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1 + - script: | + set -o errexit + set -o xtrace + + until kubectl assert exist-enhanced crd perconapgclusters.pgv2.percona.com --timeout 10s; do + echo "Waiting for CRD to be registered..." + sleep 5 + done + + until kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1 --timeout 10s; do + echo "Waiting for operator to be ready..." + sleep 5 + done diff --git a/e2e-tests/tests/upgrade-minor/01-assert.yaml b/e2e-tests/tests/upgrade-minor/01-assert.yaml index 8031a84b03..763e98b46c 100644 --- a/e2e-tests/tests/upgrade-minor/01-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/01-assert.yaml @@ -16,7 +16,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -42,7 +42,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -70,7 +70,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -90,14 +90,14 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: replica-create postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: generation: 1 @@ -105,7 +105,7 @@ metadata: e2e: upgrade-minor name: upgrade-minor ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: upgrade-minor controller: true @@ -134,7 +134,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: upgrade-minor diff --git a/e2e-tests/tests/upgrade-minor/04-assert.yaml b/e2e-tests/tests/upgrade-minor/04-assert.yaml index 71706afc05..a177afc854 100644 --- a/e2e-tests/tests/upgrade-minor/04-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/04-assert.yaml @@ -1,24 +1,17 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: perconapgclusters.pgv3.percona.com -spec: - group: pgv3.percona.com - names: - kind: PerconaPGCluster - listKind: PerconaPGClusterList - plural: perconapgclusters - singular: perconapgcluster - scope: Namespaced ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -metadata: - name: check-operator-deploy-status -timeout: 45 commands: - - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1,status.observedGeneration=2 + - script: | + set -o errexit + set -o xtrace + + until kubectl assert exist-enhanced crd perconapgclusters.pgv3.percona.com --timeout 10s; do + echo "Waiting for new CRD to be registered..." + sleep 5 + done + + until kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1,status.observedGeneration=2 --timeout 10s; do + echo "Waiting for operator to be ready..." + sleep 5 + done From 47274f8e1d6b0c791bcfc339186acef00f5bae5f Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Thu, 16 Jul 2026 18:36:58 +0500 Subject: [PATCH 29/38] fix upgrade test --- e2e-tests/tests/upgrade-minor/05-assert.yaml | 26 +++++-------------- e2e-tests/tests/upgrade-minor/06-assert.yaml | 23 ---------------- .../upgrade-minor/06-upgrade-cluster.yaml | 11 ++++++++ 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/e2e-tests/tests/upgrade-minor/05-assert.yaml b/e2e-tests/tests/upgrade-minor/05-assert.yaml index 9f452835ea..b2633609d3 100644 --- a/e2e-tests/tests/upgrade-minor/05-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/05-assert.yaml @@ -16,7 +16,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -43,7 +43,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -71,7 +71,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -82,7 +82,7 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: generation: 1 @@ -90,7 +90,7 @@ metadata: e2e: upgrade-minor name: upgrade-minor ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: upgrade-minor controller: true @@ -119,26 +119,12 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: upgrade-minor generation: 1 status: - conditions: - - type: ReadyForBackup - status: "True" - - type: PGBackRestRepoHostReady - status: "True" - - type: PGBackRestReplicaRepoReady - status: "True" - - type: PGBackRestReplicaCreate - status: "True" - - type: ProxyAvailable - status: "True" - - type: APIGroupMigration - reason: APIGroupMigrationNotNeeded - status: "True" pgbouncer: ready: 3 size: 3 diff --git a/e2e-tests/tests/upgrade-minor/06-assert.yaml b/e2e-tests/tests/upgrade-minor/06-assert.yaml index dfade7bf5f..afedea608f 100644 --- a/e2e-tests/tests/upgrade-minor/06-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/06-assert.yaml @@ -22,7 +22,6 @@ metadata: controller: true blockOwnerDeletion: true status: - observedGeneration: 2 replicas: 1 readyReplicas: 1 currentReplicas: 1 @@ -32,7 +31,6 @@ status: kind: StatefulSet apiVersion: apps/v1 metadata: - generation: 2 labels: app.kubernetes.io/component: pg app.kubernetes.io/instance: upgrade-minor @@ -64,7 +62,6 @@ spec: status: availableReplicas: 1 collisionCount: 0 - observedGeneration: 2 readyReplicas: 1 replicas: 1 updatedReplicas: 1 @@ -88,31 +85,13 @@ metadata: controller: true blockOwnerDeletion: true status: - observedGeneration: 2 replicas: 3 updatedReplicas: 3 readyReplicas: 3 --- -kind: Job -apiVersion: batch/v1 -metadata: - labels: - postgres-operator.crunchydata.com/cluster: upgrade-minor - postgres-operator.crunchydata.com/pgbackrest: '' - postgres-operator.crunchydata.com/pgbackrest-backup: replica-create - postgres-operator.crunchydata.com/pgbackrest-repo: repo1 - ownerReferences: - - apiVersion: pgv3.percona.com/v2 - kind: PerconaPGBackup - controller: true - blockOwnerDeletion: true -status: - succeeded: 1 ---- apiVersion: upstream.pgv3.percona.com/v1beta1 kind: PostgresCluster metadata: - generation: 2 labels: e2e: upgrade-minor name: upgrade-minor @@ -130,7 +109,6 @@ status: readyReplicas: 3 replicas: 3 updatedReplicas: 3 - observedGeneration: 2 pgbackrest: repoHost: apiVersion: apps/v1 @@ -149,7 +127,6 @@ status: apiVersion: pgv3.percona.com/v2 kind: PerconaPGCluster metadata: - generation: 2 name: upgrade-minor status: pgbouncer: diff --git a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml index 49cccd600e..17993212f9 100644 --- a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml @@ -20,12 +20,23 @@ commands: cr_ver=$(yq '.spec.crVersion' $DEPLOY_DIR/cr.yaml) yq -i eval ' + .apiVersion = "pgv3.percona.com/v2" | .metadata.name = "'${test_name}'" | .metadata.labels = {"e2e":"'${test_name}'"} | .spec.crVersion = "'${cr_ver}'" | .spec.image = "'${target_image_postgresql}'" | .spec.proxy.pgBouncer.image = "'${target_image_pgbouncer}'" | .spec.backups.pgbackrest.image = "'${target_image_backrest}'"' "${TEMP_DIR}/cr_lower.yaml" + + # Migrate from pgv2 to pgv3: orphan-delete old CRs so child resources (StatefulSets, etc.) are preserved + # Remove finalizer from pgv2 PostgresCluster (no controller watches pgv2 anymore) + kubectl -n "${NAMESPACE}" patch postgrescluster.upstream.pgv2.percona.com "${test_name}" \ + --type=json -p='[{"op":"remove","path":"/metadata/finalizers"}]' --ignore-not-found || true + kubectl -n "${NAMESPACE}" delete postgrescluster.upstream.pgv2.percona.com "${test_name}" \ + --cascade=orphan --ignore-not-found + kubectl -n "${NAMESPACE}" delete perconapgcluster.pgv2.percona.com "${test_name}" \ + --cascade=orphan --ignore-not-found + kubectl -n "${NAMESPACE}" apply -f "${TEMP_DIR}/cr_lower.yaml" sleep 7 # wait for reconcile loop From a73fc80c25505fa13fc23bc2d54ad75266839ee0 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Mon, 20 Jul 2026 17:10:22 +0500 Subject: [PATCH 30/38] revert the upgrade-minor test to main state --- e2e-tests/tests/upgrade-minor/00-assert.yaml | 33 ++++++++++------- e2e-tests/tests/upgrade-minor/04-assert.yaml | 33 ++++++++++------- e2e-tests/tests/upgrade-minor/05-assert.yaml | 14 ++++++++ e2e-tests/tests/upgrade-minor/06-assert.yaml | 35 +++++++++++++++---- .../upgrade-minor/06-upgrade-cluster.yaml | 12 ------- .../99-remove-cluster-gracefully.yaml | 4 +-- 6 files changed, 85 insertions(+), 46 deletions(-) diff --git a/e2e-tests/tests/upgrade-minor/00-assert.yaml b/e2e-tests/tests/upgrade-minor/00-assert.yaml index 50ac646d0d..ae5a062d84 100644 --- a/e2e-tests/tests/upgrade-minor/00-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/00-assert.yaml @@ -1,17 +1,24 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: perconapgclusters.pgv2.percona.com +spec: + group: pgv2.percona.com + names: + kind: PerconaPGCluster + listKind: PerconaPGClusterList + plural: perconapgclusters + singular: perconapgcluster + scope: Namespaced +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: check-operator-deploy-status +timeout: 120 commands: - - script: | - set -o errexit - set -o xtrace - - until kubectl assert exist-enhanced crd perconapgclusters.pgv2.percona.com --timeout 10s; do - echo "Waiting for CRD to be registered..." - sleep 5 - done - - until kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1 --timeout 10s; do - echo "Waiting for operator to be ready..." - sleep 5 - done + - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1 diff --git a/e2e-tests/tests/upgrade-minor/04-assert.yaml b/e2e-tests/tests/upgrade-minor/04-assert.yaml index a177afc854..93804ea3e2 100644 --- a/e2e-tests/tests/upgrade-minor/04-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/04-assert.yaml @@ -1,17 +1,24 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: perconapgclusters.pgv2.percona.com +spec: + group: pgv2.percona.com + names: + kind: PerconaPGCluster + listKind: PerconaPGClusterList + plural: perconapgclusters + singular: perconapgcluster + scope: Namespaced +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: check-operator-deploy-status +timeout: 45 commands: - - script: | - set -o errexit - set -o xtrace - - until kubectl assert exist-enhanced crd perconapgclusters.pgv3.percona.com --timeout 10s; do - echo "Waiting for new CRD to be registered..." - sleep 5 - done - - until kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1,status.observedGeneration=2 --timeout 10s; do - echo "Waiting for operator to be ready..." - sleep 5 - done + - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1,status.observedGeneration=2 diff --git a/e2e-tests/tests/upgrade-minor/05-assert.yaml b/e2e-tests/tests/upgrade-minor/05-assert.yaml index b2633609d3..68dea800a5 100644 --- a/e2e-tests/tests/upgrade-minor/05-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/05-assert.yaml @@ -125,6 +125,20 @@ metadata: name: upgrade-minor generation: 1 status: + conditions: + - type: ReadyForBackup + status: "True" + - type: PGBackRestRepoHostReady + status: "True" + - type: PGBackRestReplicaRepoReady + status: "True" + - type: PGBackRestReplicaCreate + status: "True" + - type: ProxyAvailable + status: "True" + - type: APIGroupMigration + reason: APIGroupMigrationNotNeeded + status: "True" pgbouncer: ready: 3 size: 3 diff --git a/e2e-tests/tests/upgrade-minor/06-assert.yaml b/e2e-tests/tests/upgrade-minor/06-assert.yaml index afedea608f..f009790bc7 100644 --- a/e2e-tests/tests/upgrade-minor/06-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/06-assert.yaml @@ -16,12 +16,13 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true blockOwnerDeletion: true status: + observedGeneration: 2 replicas: 1 readyReplicas: 1 currentReplicas: 1 @@ -31,6 +32,7 @@ status: kind: StatefulSet apiVersion: apps/v1 metadata: + generation: 2 labels: app.kubernetes.io/component: pg app.kubernetes.io/instance: upgrade-minor @@ -41,7 +43,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -62,6 +64,7 @@ spec: status: availableReplicas: 1 collisionCount: 0 + observedGeneration: 2 readyReplicas: 1 replicas: 1 updatedReplicas: 1 @@ -79,24 +82,42 @@ metadata: postgres-operator.crunchydata.com/cluster: upgrade-minor postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true blockOwnerDeletion: true status: + observedGeneration: 2 replicas: 3 updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +kind: Job +apiVersion: batch/v1 +metadata: + labels: + postgres-operator.crunchydata.com/cluster: upgrade-minor + postgres-operator.crunchydata.com/pgbackrest: '' + postgres-operator.crunchydata.com/pgbackrest-backup: replica-create + postgres-operator.crunchydata.com/pgbackrest-repo: repo1 + ownerReferences: + - apiVersion: pgv2.percona.com/v2 + kind: PerconaPGBackup + controller: true + blockOwnerDeletion: true +status: + succeeded: 1 +--- +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: + generation: 2 labels: e2e: upgrade-minor name: upgrade-minor ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: upgrade-minor controller: true @@ -109,6 +130,7 @@ status: readyReplicas: 3 replicas: 3 updatedReplicas: 3 + observedGeneration: 2 pgbackrest: repoHost: apiVersion: apps/v1 @@ -124,9 +146,10 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: + generation: 2 name: upgrade-minor status: pgbouncer: diff --git a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml index 17993212f9..17da01a3c6 100644 --- a/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/06-upgrade-cluster.yaml @@ -20,23 +20,12 @@ commands: cr_ver=$(yq '.spec.crVersion' $DEPLOY_DIR/cr.yaml) yq -i eval ' - .apiVersion = "pgv3.percona.com/v2" | .metadata.name = "'${test_name}'" | .metadata.labels = {"e2e":"'${test_name}'"} | .spec.crVersion = "'${cr_ver}'" | .spec.image = "'${target_image_postgresql}'" | .spec.proxy.pgBouncer.image = "'${target_image_pgbouncer}'" | .spec.backups.pgbackrest.image = "'${target_image_backrest}'"' "${TEMP_DIR}/cr_lower.yaml" - - # Migrate from pgv2 to pgv3: orphan-delete old CRs so child resources (StatefulSets, etc.) are preserved - # Remove finalizer from pgv2 PostgresCluster (no controller watches pgv2 anymore) - kubectl -n "${NAMESPACE}" patch postgrescluster.upstream.pgv2.percona.com "${test_name}" \ - --type=json -p='[{"op":"remove","path":"/metadata/finalizers"}]' --ignore-not-found || true - kubectl -n "${NAMESPACE}" delete postgrescluster.upstream.pgv2.percona.com "${test_name}" \ - --cascade=orphan --ignore-not-found - kubectl -n "${NAMESPACE}" delete perconapgcluster.pgv2.percona.com "${test_name}" \ - --cascade=orphan --ignore-not-found - kubectl -n "${NAMESPACE}" apply -f "${TEMP_DIR}/cr_lower.yaml" sleep 7 # wait for reconcile loop @@ -46,4 +35,3 @@ commands: kubectl wait -n $NAMESPACE --timeout 180s --for=jsonpath='{.spec.template.spec.containers[0].image}'=$target_image_postgresql sts/${s} done timeout: 180 - diff --git a/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml index 288752ff5e..2b66900ebe 100644 --- a/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml @@ -1,9 +1,9 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep delete: -- apiVersion: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster commands: - script: |- From 53830c1bf0f8119d1e6c7a1e0e8a4308f5b78169 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Mon, 20 Jul 2026 17:55:16 +0500 Subject: [PATCH 31/38] revert GroupVersion --- Makefile | 28 +++++--- ...ator.crunchydata.com_postgresclusters.yaml | 4 +- build/crd/crunchy/kustomization.yaml | 10 +-- .../crunchybridgeclusters/kustomization.yaml | 4 +- ...=> pgv2.percona.com_perconapgbackups.yaml} | 4 +- ...> pgv2.percona.com_perconapgclusters.yaml} | 4 +- ...> pgv2.percona.com_perconapgrestores.yaml} | 4 +- ...> pgv2.percona.com_perconapgupgrades.yaml} | 4 +- build/crd/percona/kustomization.yaml | 8 +-- build/crd/pgadmins/kustomization.yaml | 6 +- build/crd/pgupgrades/kustomization.yaml | 6 +- build/crd/postgresclusters/kustomization.yaml | 10 +-- build/postgres-operator/Dockerfile | 4 +- cmd/postgres-operator/main.go | 4 +- cmd/postgres-operator/main_test.go | 42 +++++------ ...> pgv2.percona.com_perconapgclusters.yaml} | 16 ++--- ...v2.percona.com_crunchybridgeclusters.yaml} | 4 +- ...> upstream.pgv2.percona.com_pgadmins.yaml} | 4 +- ...upstream.pgv2.percona.com_pgupgrades.yaml} | 4 +- ...am.pgv2.percona.com_postgresclusters.yaml} | 4 +- config/crd/kustomization.yaml | 10 +-- .../versionlabel_in_perconapgbackups.yaml | 4 +- .../versionlabel_in_perconapgclusters.yaml | 4 +- .../versionlabel_in_perconapgrestores.yaml | 4 +- .../versionlabel_in_perconapgupgrade.yaml | 4 +- config/manager/default/kustomization.yaml | 2 +- config/rbac/cluster/role.yaml | 26 +++---- config/rbac/namespace/role.yaml | 26 +++---- deploy/backup.yaml | 2 +- deploy/bundle.yaml | 72 +++++++++---------- deploy/cr.yaml | 2 +- deploy/crd.yaml | 40 +++++------ deploy/cw-bundle.yaml | 72 +++++++++---------- deploy/cw-operator.yaml | 6 +- deploy/cw-rbac.yaml | 26 +++---- deploy/operator.yaml | 6 +- deploy/rbac.yaml | 26 +++---- deploy/restore.yaml | 2 +- deploy/upgrade.yaml | 2 +- docs/content/references/crd.md | 18 ++--- .../backup-enable-disable/00-assert.yaml | 4 +- .../backup-enable-disable/01-assert.yaml | 10 +-- .../backup-enable-disable/02-assert.yaml | 14 ++-- .../backup-enable-disable/03-assert.yaml | 10 +-- .../backup-enable-disable/04-assert.yaml | 14 ++-- .../backup-enable-disable/05-assert.yaml | 10 +-- .../05-disable-backups-datasource.yaml | 2 +- .../backup-enable-disable/07-assert.yaml | 10 +-- .../07-disable-backups.yaml | 2 +- .../backup-enable-disable/09-assert.yaml | 2 +- .../09-enable-backups-again.yaml | 2 +- ...10-disable-backups-without-annotation.yaml | 2 +- ...-remove-datasource-cluster-gracefully.yaml | 4 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/backup-enable-disable-spaces.yaml | 2 +- .../conf/backup-enable-disable.yaml | 2 +- .../tests/builtin-extensions/00-assert.yaml | 4 +- .../tests/builtin-extensions/01-assert.yaml | 14 ++-- .../tests/builtin-extensions/03-assert.yaml | 14 ++-- .../03-install-all-ext.yaml | 2 +- .../tests/builtin-extensions/06-assert.yaml | 14 ++-- .../tests/builtin-extensions/09-assert.yaml | 14 ++-- .../09-uninstall-all-ext.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/cert-manager-tls/00-assert.yaml | 4 +- .../tests/cert-manager-tls/01-assert.yaml | 8 +-- .../tests/cert-manager-tls/09-assert.yaml | 12 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/custom-envs/00-assert.yaml | 4 +- e2e-tests/tests/custom-envs/01-assert.yaml | 12 ++-- e2e-tests/tests/custom-envs/02-assert.yaml | 6 +- e2e-tests/tests/custom-envs/03-assert.yaml | 6 +- e2e-tests/tests/custom-envs/04-assert.yaml | 6 +- e2e-tests/tests/custom-envs/05-assert.yaml | 6 +- e2e-tests/tests/custom-envs/06-assert.yaml | 6 +- e2e-tests/tests/custom-envs/07-assert.yaml | 6 +- e2e-tests/tests/custom-envs/08-assert.yaml | 6 +- e2e-tests/tests/custom-envs/09-assert.yaml | 6 +- e2e-tests/tests/custom-envs/10-assert.yaml | 6 +- e2e-tests/tests/custom-envs/11-assert.yaml | 6 +- e2e-tests/tests/custom-envs/12-assert.yaml | 6 +- e2e-tests/tests/custom-envs/13-assert.yaml | 6 +- e2e-tests/tests/custom-envs/14-assert.yaml | 6 +- e2e-tests/tests/custom-envs/15-assert.yaml | 6 +- e2e-tests/tests/custom-envs/16-assert.yaml | 6 +- e2e-tests/tests/custom-envs/17-assert.yaml | 6 +- e2e-tests/tests/custom-envs/18-assert.yaml | 6 +- e2e-tests/tests/custom-envs/19-assert.yaml | 6 +- e2e-tests/tests/custom-envs/20-assert.yaml | 6 +- e2e-tests/tests/custom-envs/21-assert.yaml | 6 +- e2e-tests/tests/custom-envs/22-assert.yaml | 6 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/custom-extensions/00-assert.yaml | 4 +- .../tests/custom-extensions/01-assert.yaml | 14 ++-- .../tests/custom-extensions/02-assert.yaml | 4 +- .../custom-extensions/02-install-pg_cron.yaml | 2 +- .../tests/custom-extensions/05-assert.yaml | 4 +- .../tests/custom-extensions/06-assert.yaml | 4 +- .../06-uninstall-pg_cron.yaml | 2 +- .../tests/custom-extensions/07-assert.yaml | 4 +- .../tests/custom-extensions/10-assert.yaml | 14 ++-- .../tests/custom-extensions/11-assert.yaml | 4 +- .../custom-extensions/11-install-pg_cron.yaml | 2 +- .../tests/custom-extensions/14-assert.yaml | 4 +- .../custom-extensions/14-update-pg_cron.yaml | 2 +- .../tests/custom-extensions/15-assert.yaml | 4 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/custom-extensions.yaml | 2 +- e2e-tests/tests/custom-tls/00-assert.yaml | 4 +- e2e-tests/tests/custom-tls/03-assert.yaml | 12 ++-- e2e-tests/tests/custom-tls/11-assert.yaml | 10 +-- e2e-tests/tests/custom-tls/12-assert.yaml | 10 +-- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/database-init-sql/00-assert.yaml | 4 +- .../tests/database-init-sql/02-assert.yaml | 10 +-- .../99-remove-cluster-gracefully.yaml | 4 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 12 ++-- .../04-assert.yaml | 4 +- .../04-create-backup-snapshot.yaml | 2 +- .../05-assert.yaml | 6 +- .../05-create-restore.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-create-backup-pgbackrest.yaml | 2 +- .../08-assert.yaml | 4 +- .../08-create-backup-snapshot.yaml | 2 +- .../09-assert.yaml | 6 +- .../09-create-restore-pitr.yaml | 2 +- .../11-assert.yaml | 12 ++-- .../99-cleanup.yaml | 8 +-- e2e-tests/tests/demand-backup/00-assert.yaml | 4 +- e2e-tests/tests/demand-backup/01-assert.yaml | 12 ++-- e2e-tests/tests/demand-backup/04-assert.yaml | 6 +- .../demand-backup/04-create-backup-repo1.yaml | 6 +- .../05-check-pgbackrest-info-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/06-assert.yaml | 6 +- .../demand-backup/06-create-backup-repo3.yaml | 2 +- .../07-check-pgbackrest-info-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/08-assert.yaml | 6 +- .../08-create-second-backup-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/10-assert.yaml | 6 +- .../10-create-second-backup-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/11-assert.yaml | 6 +- .../11-create-third-backup-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/14-assert.yaml | 8 +-- .../14-recreate-backup-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/15-assert.yaml | 8 +-- .../15-recreate-backup-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/18-assert.yaml | 8 +-- .../18-create-restore-repo1.yaml | 2 +- e2e-tests/tests/demand-backup/19-assert.yaml | 6 +- e2e-tests/tests/demand-backup/21-assert.yaml | 6 +- .../21-create-restore-repo3.yaml | 2 +- e2e-tests/tests/demand-backup/22-assert.yaml | 6 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/demand-backup-spaces.yaml | 2 +- .../demand-backup/conf/demand-backup.yaml | 2 +- .../dynamic-configuration/00-assert.yaml | 4 +- .../dynamic-configuration/01-assert.yaml | 12 ++-- .../02-apply-configuration.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/finalizers/00-assert.yaml | 4 +- e2e-tests/tests/finalizers/01-assert.yaml | 14 ++-- .../tests/finalizers/02-delete-cluster.yaml | 2 +- e2e-tests/tests/finalizers/03-assert.yaml | 14 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/huge-pages/00-assert.yaml | 4 +- e2e-tests/tests/huge-pages/01-assert.yaml | 14 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/huge-pages/conf/huge-pages-aks.yaml | 2 +- e2e-tests/tests/init-deploy/00-assert.yaml | 4 +- e2e-tests/tests/init-deploy/01-assert.yaml | 14 ++-- e2e-tests/tests/init-deploy/05-assert.yaml | 22 +++--- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/k8s-upgrade/01-assert.yaml | 8 +-- .../tests/k8s-upgrade/04-create-backup.yaml | 2 +- .../tests/k8s-upgrade/09-restore-backup.yaml | 2 +- .../k8s-upgrade/conf/k8s-upgrade-spaces.yaml | 2 +- .../tests/k8s-upgrade/conf/k8s-upgrade.yaml | 2 +- e2e-tests/tests/ldap-tls/00-assert.yaml | 4 +- e2e-tests/tests/ldap-tls/03-assert.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/ldap/00-assert.yaml | 4 +- e2e-tests/tests/ldap/02-assert.yaml | 2 +- .../ldap/99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/ldap/files/cluster.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 ++-- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-14-to-15-postgis.yaml | 2 +- .../major-upgrade-14-to-15/00-assert.yaml | 4 +- .../major-upgrade-14-to-15/01-assert.yaml | 14 ++-- .../major-upgrade-14-to-15/04-assert.yaml | 6 +- .../major-upgrade-14-to-15/04-upgrade.yaml | 2 +- .../major-upgrade-14-to-15/07-assert.yaml | 4 +- .../major-upgrade-14-to-15/07-run-backup.yaml | 2 +- .../major-upgrade-14-to-15/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-14-to-15.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 ++-- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-15-to-16-postgis.yaml | 2 +- .../major-upgrade-15-to-16/00-assert.yaml | 4 +- .../major-upgrade-15-to-16/01-assert.yaml | 14 ++-- .../major-upgrade-15-to-16/04-assert.yaml | 6 +- .../major-upgrade-15-to-16/04-upgrade.yaml | 2 +- .../major-upgrade-15-to-16/07-assert.yaml | 4 +- .../major-upgrade-15-to-16/07-run-backup.yaml | 2 +- .../major-upgrade-15-to-16/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-15-to-16.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 ++-- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-16-to-17-postgis.yaml | 2 +- .../major-upgrade-16-to-17/00-assert.yaml | 4 +- .../major-upgrade-16-to-17/01-assert.yaml | 14 ++-- .../major-upgrade-16-to-17/04-assert.yaml | 6 +- .../major-upgrade-16-to-17/04-upgrade.yaml | 2 +- .../major-upgrade-16-to-17/07-assert.yaml | 4 +- .../major-upgrade-16-to-17/07-run-backup.yaml | 2 +- .../major-upgrade-16-to-17/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-16-to-17.yaml | 2 +- .../00-assert.yaml | 4 +- .../01-assert.yaml | 14 ++-- .../04-assert.yaml | 6 +- .../04-upgrade.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-run-backup.yaml | 2 +- .../10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-17-to-18-postgis.yaml | 2 +- .../major-upgrade-17-to-18/00-assert.yaml | 4 +- .../major-upgrade-17-to-18/01-assert.yaml | 14 ++-- .../major-upgrade-17-to-18/04-assert.yaml | 6 +- .../major-upgrade-17-to-18/04-upgrade.yaml | 2 +- .../major-upgrade-17-to-18/07-assert.yaml | 4 +- .../major-upgrade-17-to-18/07-run-backup.yaml | 2 +- .../major-upgrade-17-to-18/10-assert.yaml | 4 +- .../10-run-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/major-upgrade-17-to-18.yaml | 2 +- .../tests/migration-backup-s3/08-assert.yaml | 4 +- .../tests/migration-backup-s3/09-assert.yaml | 12 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- .../migration-data-volumes/05-assert.yaml | 4 +- .../migration-data-volumes/09-assert.yaml | 16 ++--- .../99-remove-cluster-gracefully.yaml | 4 +- .../04-assert.yaml | 14 ++-- .../06-assert.yaml | 2 +- .../07-assert.yaml | 4 +- .../07-backup.yaml | 2 +- .../08-assert.yaml | 8 +-- .../08-restore.yaml | 2 +- .../11-assert.yaml | 4 +- .../11-backup.yaml | 2 +- .../12-assert.yaml | 8 +-- .../12-restore.yaml | 2 +- .../99-cleanup.yaml | 4 +- .../conf/percona-restored.yaml | 2 +- .../migration-from-crunchy-pv/04-assert.yaml | 6 +- .../migration-from-crunchy-pv/06-assert.yaml | 4 +- .../migration-from-crunchy-pv/06-backup.yaml | 2 +- .../migration-from-crunchy-pv/07-assert.yaml | 8 +-- .../migration-from-crunchy-pv/07-restore.yaml | 2 +- .../migration-from-crunchy-pv/99-cleanup.yaml | 4 +- .../conf/percona-migrated.yaml | 2 +- .../00-assert.yaml | 4 +- .../04-assert.yaml | 8 +-- .../10-assert.yaml | 4 +- .../12-assert.yaml | 4 +- .../12-backup.yaml | 2 +- .../13-assert.yaml | 8 +-- .../13-restore.yaml | 2 +- .../99-cleanup.yaml | 4 +- .../conf/percona-standby.yaml | 2 +- .../tests/monitoring-pmm3/00-assert.yaml | 4 +- .../tests/monitoring-pmm3/03-assert.yaml | 8 +-- .../tests/monitoring-pmm3/04-assert.yaml | 8 +-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/monitoring/00-assert.yaml | 4 +- e2e-tests/tests/monitoring/03-assert.yaml | 8 +-- e2e-tests/tests/monitoring/04-assert.yaml | 8 +-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/one-pod/00-assert.yaml | 4 +- e2e-tests/tests/one-pod/01-assert.yaml | 12 ++-- e2e-tests/tests/one-pod/04-assert.yaml | 4 +- e2e-tests/tests/one-pod/04-create-backup.yaml | 2 +- .../one-pod/05-check-pgbackrest-info.yaml | 2 +- e2e-tests/tests/one-pod/07-assert.yaml | 6 +- .../tests/one-pod/07-create-restore.yaml | 2 +- e2e-tests/tests/one-pod/08-assert.yaml | 6 +- .../one-pod/99-remove-cluster-gracefully.yaml | 4 +- .../operator-self-healing/00-assert.yaml | 4 +- .../operator-self-healing/02-assert.yaml | 14 ++-- .../operator-self-healing/05-assert.yaml | 4 +- .../operator-self-healing/06-assert.yaml | 4 +- .../operator-self-healing/07-assert.yaml | 4 +- .../operator-self-healing/08-assert.yaml | 4 +- .../operator-self-healing/09-assert.yaml | 4 +- .../operator-self-healing/10-assert.yaml | 4 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../pg-tde/99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/pitr/00-assert.yaml | 4 +- e2e-tests/tests/pitr/01-assert.yaml | 12 ++-- e2e-tests/tests/pitr/04-assert.yaml | 4 +- e2e-tests/tests/pitr/04-create-backup.yaml | 2 +- e2e-tests/tests/pitr/05-assert.yaml | 6 +- e2e-tests/tests/pitr/05-create-restore.yaml | 2 +- e2e-tests/tests/pitr/07-assert.yaml | 4 +- e2e-tests/tests/pitr/07-create-backup.yaml | 2 +- .../pitr/99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/scaling/00-assert.yaml | 4 +- e2e-tests/tests/scaling/01-assert.yaml | 14 ++-- e2e-tests/tests/scaling/04-assert.yaml | 14 ++-- e2e-tests/tests/scaling/07-assert.yaml | 14 ++-- e2e-tests/tests/scaling/10-assert.yaml | 14 ++-- e2e-tests/tests/scaling/13-assert.yaml | 14 ++-- .../scaling/99-remove-cluster-gracefully.yaml | 4 +- .../tests/scheduled-backup/00-assert.yaml | 4 +- .../tests/scheduled-backup/01-assert.yaml | 12 ++-- .../tests/scheduled-backup/03-assert.yaml | 4 +- .../tests/scheduled-backup/04-assert.yaml | 8 +-- .../tests/scheduled-backup/05-assert.yaml | 2 +- .../tests/scheduled-backup/06-assert.yaml | 6 +- .../tests/scheduled-backup/08-assert.yaml | 8 +-- .../tests/scheduled-backup/09-assert.yaml | 10 +-- .../tests/scheduled-backup/11-assert.yaml | 6 +- .../11-start-repo1-restore.yaml | 2 +- .../tests/scheduled-backup/14-assert.yaml | 6 +- .../14-start-repo2-restore.yaml | 2 +- .../tests/scheduled-backup/17-assert.yaml | 6 +- .../17-start-repo3-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/scheduled-backup-spaces.yaml | 2 +- .../conf/scheduled-backup.yaml | 2 +- e2e-tests/tests/self-healing/00-assert.yaml | 4 +- e2e-tests/tests/self-healing/02-assert.yaml | 14 ++-- e2e-tests/tests/self-healing/05-assert.yaml | 14 ++-- e2e-tests/tests/self-healing/08-assert.yaml | 14 ++-- e2e-tests/tests/self-healing/11-assert.yaml | 14 ++-- e2e-tests/tests/self-healing/14-assert.yaml | 14 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/sidecars/00-assert.yaml | 4 +- e2e-tests/tests/sidecars/01-assert.yaml | 16 ++--- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/standby-pgbackrest/00-assert.yaml | 4 +- .../tests/standby-pgbackrest/01-assert.yaml | 12 ++-- .../tests/standby-pgbackrest/02-assert.yaml | 12 ++-- .../tests/standby-pgbackrest/10-assert.yaml | 12 ++-- .../tests/standby-pgbackrest/99-cleanup.yaml | 8 +-- .../conf/source-cluster-spaces.yaml | 2 +- .../conf/source-cluster.yaml | 2 +- .../conf/standby-cluster-spaces.yaml | 2 +- .../conf/standby-cluster.yaml | 2 +- .../tests/standby-streaming/00-assert.yaml | 4 +- .../tests/standby-streaming/01-assert.yaml | 12 ++-- .../tests/standby-streaming/02-assert.yaml | 12 ++-- .../tests/standby-streaming/10-assert.yaml | 12 ++-- .../tests/standby-streaming/99-cleanup.yaml | 8 +-- .../tests/start-from-backup/00-assert.yaml | 4 +- .../tests/start-from-backup/01-assert.yaml | 12 ++-- .../tests/start-from-backup/04-assert.yaml | 6 +- .../04-create-backup-repo1.yaml | 2 +- .../05-delete-source-cluster.yaml | 4 +- .../tests/start-from-backup/06-assert.yaml | 14 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- .../conf/start-from-backup-source-spaces.yaml | 2 +- .../conf/start-from-backup-source.yaml | 2 +- .../conf/start-from-backup-spaces.yaml | 2 +- .../conf/start-from-backup.yaml | 2 +- e2e-tests/tests/tablespaces/00-assert.yaml | 4 +- e2e-tests/tests/tablespaces/01-assert.yaml | 12 ++-- e2e-tests/tests/tablespaces/05-assert.yaml | 4 +- .../tests/tablespaces/05-create-backup.yaml | 2 +- e2e-tests/tests/tablespaces/08-assert.yaml | 6 +- .../tests/tablespaces/08-create-restore.yaml | 2 +- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/telemetry-transfer/01-assert.yaml | 4 +- .../tests/telemetry-transfer/02-assert.yaml | 14 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- .../tests/upgrade-consistency/00-assert.yaml | 4 +- .../tests/upgrade-consistency/01-assert.yaml | 14 ++-- .../tests/upgrade-consistency/02-assert.yaml | 14 ++-- .../tests/upgrade-consistency/03-assert.yaml | 14 ++-- .../99-remove-cluster-gracefully.yaml | 4 +- e2e-tests/tests/users/00-assert.yaml | 4 +- e2e-tests/tests/users/01-assert.yaml | 14 ++-- e2e-tests/tests/users/07-assert.yaml | 6 +- e2e-tests/tests/users/13-assert.yaml | 6 +- e2e-tests/tests/users/16-assert.yaml | 6 +- .../users/99-remove-cluster-gracefully.yaml | 4 +- .../crunchybridgecluster.yaml | 2 +- examples/pgadmin/pgadmin.yaml | 2 +- examples/postgrescluster/postgrescluster.yaml | 2 +- hack/create-todo-patch.sh | 6 +- .../olm/config/examples/pgadmin.example.yaml | 2 +- .../config/examples/pgupgrade.example.yaml | 2 +- .../examples/postgrescluster.example.yaml | 2 +- internal/bridge/client.go | 2 +- .../crunchybridgecluster_controller.go | 12 ++-- .../crunchybridgecluster_controller_test.go | 2 +- .../bridge/crunchybridgecluster/delete.go | 2 +- .../crunchybridgecluster/helpers_test.go | 2 +- .../crunchybridgecluster/mock_bridge_api.go | 2 +- .../bridge/crunchybridgecluster/postgres.go | 2 +- .../crunchybridgecluster/postgres_test.go | 2 +- .../bridge/crunchybridgecluster/watches.go | 6 +- internal/config/config.go | 2 +- internal/config/config_test.go | 2 +- internal/controller/pgupgrade/jobs.go | 2 +- internal/controller/pgupgrade/jobs_test.go | 6 +- internal/controller/pgupgrade/labels.go | 2 +- .../pgupgrade/pgupgrade_controller.go | 16 ++--- internal/controller/pgupgrade/registration.go | 2 +- .../controller/pgupgrade/registration_test.go | 2 +- internal/controller/pgupgrade/utils.go | 4 +- internal/controller/pgupgrade/world.go | 4 +- internal/controller/pgupgrade/world_test.go | 2 +- .../controller/postgrescluster/cluster.go | 2 +- .../postgrescluster/cluster_test.go | 8 +-- .../controller/postgrescluster/controller.go | 8 +-- .../postgrescluster/controller_ref_manager.go | 2 +- .../postgrescluster/controller_test.go | 2 +- internal/controller/postgrescluster/delete.go | 4 +- .../postgrescluster/helpers_test.go | 2 +- .../controller/postgrescluster/instance.go | 2 +- .../postgrescluster/instance_rollout_test.go | 2 +- .../postgrescluster/instance_test.go | 2 +- .../controller/postgrescluster/patroni.go | 2 +- .../postgrescluster/patroni_test.go | 4 +- .../controller/postgrescluster/pgadmin.go | 2 +- .../postgrescluster/pgadmin_test.go | 6 +- .../controller/postgrescluster/pgbackrest.go | 4 +- .../postgrescluster/pgbackrest_test.go | 12 ++-- .../controller/postgrescluster/pgbouncer.go | 2 +- .../postgrescluster/pgbouncer_test.go | 4 +- .../controller/postgrescluster/pgmonitor.go | 2 +- .../postgrescluster/pgmonitor_test.go | 2 +- internal/controller/postgrescluster/pki.go | 2 +- .../controller/postgrescluster/pki_test.go | 6 +- .../postgrescluster/pod_disruption_budget.go | 2 +- .../pod_disruption_budget_test.go | 2 +- .../controller/postgrescluster/postgres.go | 2 +- .../postgrescluster/postgres_test.go | 2 +- internal/controller/postgrescluster/rbac.go | 2 +- .../controller/postgrescluster/snapshots.go | 2 +- .../postgrescluster/snapshots_test.go | 2 +- internal/controller/postgrescluster/util.go | 2 +- .../controller/postgrescluster/util_test.go | 2 +- .../controller/postgrescluster/volumes.go | 2 +- .../postgrescluster/volumes_test.go | 2 +- internal/controller/runtime/runtime.go | 2 +- .../standalone_pgadmin/configmap.go | 2 +- .../standalone_pgadmin/configmap_test.go | 2 +- .../standalone_pgadmin/controller.go | 10 +-- .../standalone_pgadmin/controller_test.go | 2 +- .../standalone_pgadmin/helpers_unit_test.go | 2 +- internal/controller/standalone_pgadmin/pod.go | 2 +- .../controller/standalone_pgadmin/pod_test.go | 2 +- .../standalone_pgadmin/postgrescluster.go | 6 +- .../controller/standalone_pgadmin/service.go | 2 +- .../standalone_pgadmin/service_test.go | 2 +- .../standalone_pgadmin/statefulset.go | 2 +- .../standalone_pgadmin/statefulset_test.go | 2 +- .../controller/standalone_pgadmin/users.go | 2 +- .../standalone_pgadmin/users_test.go | 2 +- .../controller/standalone_pgadmin/volume.go | 2 +- .../standalone_pgadmin/volume_test.go | 2 +- .../controller/standalone_pgadmin/watches.go | 4 +- .../standalone_pgadmin/watches_test.go | 2 +- internal/naming/labels.go | 2 +- internal/naming/names.go | 2 +- internal/naming/names_test.go | 2 +- internal/naming/selectors.go | 2 +- internal/naming/selectors_test.go | 2 +- internal/patroni/config.go | 2 +- internal/patroni/config_test.go | 14 ++-- internal/patroni/rbac.go | 2 +- internal/patroni/rbac_test.go | 2 +- internal/patroni/reconcile.go | 2 +- internal/patroni/reconcile_test.go | 6 +- internal/pgadmin/config.go | 2 +- internal/pgadmin/config_test.go | 2 +- internal/pgadmin/reconcile.go | 2 +- internal/pgadmin/reconcile_test.go | 2 +- internal/pgadmin/users.go | 2 +- internal/pgadmin/users_test.go | 2 +- internal/pgbackrest/config.go | 2 +- internal/pgbackrest/config_test.go | 6 +- internal/pgbackrest/pgbackrest.go | 2 +- internal/pgbackrest/pgbackrest_test.go | 2 +- internal/pgbackrest/postgres.go | 2 +- internal/pgbackrest/postgres_test.go | 6 +- internal/pgbackrest/rbac.go | 2 +- internal/pgbackrest/rbac_test.go | 2 +- internal/pgbackrest/reconcile.go | 2 +- internal/pgbackrest/reconcile_test.go | 2 +- internal/pgbackrest/util.go | 2 +- internal/pgbackrest/util_test.go | 2 +- internal/pgbouncer/config.go | 2 +- internal/pgbouncer/config_test.go | 6 +- internal/pgbouncer/reconcile.go | 2 +- internal/pgbouncer/reconcile_test.go | 2 +- internal/pgmonitor/exporter.go | 2 +- internal/pgmonitor/exporter_test.go | 2 +- internal/pgmonitor/postgres.go | 2 +- internal/pgmonitor/postgres_test.go | 2 +- internal/pgmonitor/util.go | 2 +- internal/pgmonitor/util_test.go | 2 +- internal/pmm/hba.go | 2 +- internal/postgres/config.go | 2 +- internal/postgres/config_test.go | 2 +- internal/postgres/huge_pages.go | 2 +- internal/postgres/huge_pages_test.go | 2 +- internal/postgres/reconcile.go | 2 +- internal/postgres/reconcile_test.go | 2 +- internal/postgres/users.go | 2 +- internal/postgres/users_test.go | 2 +- internal/postgres/validation.go | 2 +- internal/postgres/validation_test.go | 2 +- internal/registration/interface.go | 2 +- internal/registration/runner.go | 2 +- .../validation/postgrescluster_test.go | 2 +- internal/upgradecheck/header.go | 2 +- internal/upgradecheck/header_test.go | 2 +- internal/upgradecheck/helpers_test.go | 2 +- percona/certmanager/certmanager.go | 2 +- percona/certmanager/certmanager_test.go | 2 +- percona/certmanager/names.go | 2 +- percona/controller/pgbackup/controller.go | 18 ++--- .../controller/pgbackup/controller_test.go | 4 +- .../controller/pgbackup/snapshots/offline.go | 2 +- .../pgbackup/snapshots/reconcile.go | 2 +- .../pgbackup/snapshots/reconcile_test.go | 4 +- percona/controller/pgbackup/testutils_test.go | 4 +- percona/controller/pgcluster/backup.go | 2 +- percona/controller/pgcluster/backup_test.go | 4 +- percona/controller/pgcluster/controller.go | 12 ++-- .../controller/pgcluster/controller_test.go | 6 +- percona/controller/pgcluster/finalizer.go | 2 +- .../controller/pgcluster/finalizer_test.go | 4 +- percona/controller/pgcluster/gethost_test.go | 4 +- .../pgcluster/owner_ref_migration.go | 4 +- .../controller/pgcluster/patroniversion.go | 2 +- .../patroniversion_distribution_test.go | 2 +- .../pgcluster/patroniversion_test.go | 2 +- percona/controller/pgcluster/pvc.go | 4 +- percona/controller/pgcluster/restore.go | 2 +- percona/controller/pgcluster/schedule.go | 4 +- percona/controller/pgcluster/secret.go | 2 +- percona/controller/pgcluster/standby.go | 4 +- percona/controller/pgcluster/standby_test.go | 4 +- percona/controller/pgcluster/status.go | 4 +- percona/controller/pgcluster/status_test.go | 4 +- percona/controller/pgcluster/suite_test.go | 4 +- .../controller/pgcluster/testutils_test.go | 4 +- percona/controller/pgcluster/version.go | 2 +- percona/controller/pgcluster/version_test.go | 2 +- percona/controller/pgrestore/controller.go | 10 +-- .../pgrestore/snapshot/reconcile.go | 4 +- .../pgrestore/snapshot/reconcile_test.go | 4 +- .../controller/pgrestore/utils/pgbackrest.go | 4 +- .../pgrestore/utils/pgbackrest_test.go | 4 +- percona/controller/pgupgrade/controller.go | 14 ++-- .../testdata/sidecar-resources-cr.yaml | 2 +- percona/extensions/containers.go | 2 +- percona/k8s/testutils_test.go | 4 +- percona/k8s/util.go | 2 +- percona/k8s/util_test.go | 2 +- percona/naming/prefix.go | 2 +- percona/pgbackrest/pgbackrest.go | 2 +- percona/pmm/pmm.go | 2 +- percona/pmm/pmm_test.go | 2 +- percona/postgres/common.go | 2 +- percona/postgres/common_test.go | 2 +- percona/testutils/client.go | 4 +- percona/version/version.go | 8 +-- percona/version/version_test.go | 8 +-- percona/watcher/wal.go | 2 +- percona/watcher/wal_test.go | 2 +- .../v2/groupversion_info.go | 4 +- .../v2/perconapgbackup_types.go | 2 +- .../v2/perconapgbackup_types_test.go | 0 .../v2/perconapgcluster_types.go | 4 +- .../v2/perconapgcluster_types_test.go | 2 +- .../v2/perconapgrestore_types.go | 0 .../v2/perconapgupgrade_types.go | 4 +- .../v2/zz_generated.deepcopy.go | 2 +- .../v1beta1/crunchy_bridgecluster_types.go | 0 .../v1beta1/groupversion_info.go | 4 +- .../v1beta1/patroni_types.go | 0 .../v1beta1/pgadmin_types.go | 0 .../v1beta1/pgbackrest_types.go | 0 .../v1beta1/pgbackrest_types_test.go | 0 .../v1beta1/pgbouncer_types.go | 0 .../v1beta1/pgmonitor_types.go | 0 .../v1beta1/pgupgrade_types.go | 0 .../v1beta1/postgres_types.go | 0 .../v1beta1/postgrescluster_test.go | 4 +- .../v1beta1/postgrescluster_types.go | 2 +- .../v1beta1/shared_types.go | 0 .../v1beta1/shared_types_test.go | 0 .../v1beta1/standalone_pgadmin_types.go | 0 .../v1beta1/zz_generated.deepcopy.go | 0 629 files changed, 1628 insertions(+), 1622 deletions(-) rename build/crd/percona/generated/{pgv3.percona.com_perconapgbackups.yaml => pgv2.percona.com_perconapgbackups.yaml} (99%) rename build/crd/percona/generated/{pgv3.percona.com_perconapgclusters.yaml => pgv2.percona.com_perconapgclusters.yaml} (99%) rename build/crd/percona/generated/{pgv3.percona.com_perconapgrestores.yaml => pgv2.percona.com_perconapgrestores.yaml} (99%) rename build/crd/percona/generated/{pgv3.percona.com_perconapgupgrades.yaml => pgv2.percona.com_perconapgupgrades.yaml} (99%) rename config/crd/bases/{pgv3.percona.com_perconapgclusters.yaml => pgv2.percona.com_perconapgclusters.yaml} (99%) rename config/crd/bases/{upstream.pgv3.percona.com_crunchybridgeclusters.yaml => upstream.pgv2.percona.com_crunchybridgeclusters.yaml} (99%) rename config/crd/bases/{upstream.pgv3.percona.com_pgadmins.yaml => upstream.pgv2.percona.com_pgadmins.yaml} (99%) rename config/crd/bases/{upstream.pgv3.percona.com_pgupgrades.yaml => upstream.pgv2.percona.com_pgupgrades.yaml} (99%) rename config/crd/bases/{upstream.pgv3.percona.com_postgresclusters.yaml => upstream.pgv2.percona.com_postgresclusters.yaml} (99%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/groupversion_info.go (84%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/perconapgbackup_types.go (99%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/perconapgbackup_types_test.go (100%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/perconapgcluster_types.go (99%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/perconapgcluster_types_test.go (99%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/perconapgrestore_types.go (100%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/perconapgupgrade_types.go (97%) rename pkg/apis/{pgv3.percona.com => pgv2.percona.com}/v2/zz_generated.deepcopy.go (99%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/crunchy_bridgecluster_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/groupversion_info.go (87%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/patroni_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/pgadmin_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/pgbackrest_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/pgbackrest_types_test.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/pgbouncer_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/pgmonitor_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/pgupgrade_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/postgres_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/postgrescluster_test.go (98%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/postgrescluster_types.go (99%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/shared_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/shared_types_test.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/standalone_pgadmin_types.go (100%) rename pkg/apis/{upstream.pgv3.percona.com => upstream.pgv2.percona.com}/v1beta1/zz_generated.deepcopy.go (100%) diff --git a/Makefile b/Makefile index 365d2ac0fb..84f1e15e69 100644 --- a/Makefile +++ b/Makefile @@ -191,6 +191,12 @@ build-postgres-operator-image: build/postgres-operator/Dockerfile --file $< --format docker --layers . ##@ Test +GOLANGCI_LINT_VERSION ?= v2.12.2 + +.PHONY: lint +lint: ## Run golangci-lint (same as CI) + go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) run --timeout 5m --max-issues-per-linter 0 --max-same-issues 0 + .PHONY: check check: ## Run basic go tests with coverage output check: get-pgmonitor @@ -246,7 +252,7 @@ generate: generate-cw generate-crunchy-crd: ## Generate crd GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \ $(CRD_OPTIONS) \ - paths='./pkg/apis/upstream.pgv3.percona.com/...' \ + paths='./pkg/apis/upstream.pgv2.percona.com/...' \ output:dir='build/crd/crunchy/generated' # build/crd/generated/{group}_{plural}.yaml @ GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \ @@ -264,10 +270,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.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 + $(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 .PHONY: generate-deepcopy generate-deepcopy: ## Generate deepcopy functions @@ -294,9 +300,9 @@ generate-percona-crd: go generate ./percona/... GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \ $(CRD_OPTIONS) \ - paths='./pkg/apis/pgv3.percona.com/...' \ + paths='./pkg/apis/pgv2.percona.com/...' \ output:dir='build/crd/percona/generated' # build/crd/generated/{group}_{plural}.yaml - $(KUSTOMIZE) build ./build/crd/percona/ > ./config/crd/bases/pgv3.percona.com_perconapgclusters.yaml + $(KUSTOMIZE) build ./build/crd/percona/ > ./config/crd/bases/pgv2.percona.com_perconapgclusters.yaml generate-manager: cd ./config/manager/namespace/ && $(KUSTOMIZE) edit set image postgres-operator=$(IMAGE) @@ -433,7 +439,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/pgv3.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/pgv2.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 +447,7 @@ release: generate -e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" deploy/upgrade.yaml # Update sidecars - $(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 + $(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 # 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 +467,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/pgv3.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/pgv2.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 +475,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#pgv3.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv3.percona.com/version: $(NEXT_VER)#" e2e-tests/tests/sidecars/01-assert.yaml + $(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 # 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 0ecbaac3a4..d1e9faf222 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.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PostgresCluster listKind: PostgresClusterList diff --git a/build/crd/crunchy/kustomization.yaml b/build/crd/crunchy/kustomization.yaml index 2a462ce6de..c525939792 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.pgv3.percona.com_postgresclusters.yaml +- generated/upstream.pgv2.percona.com_postgresclusters.yaml patchesJson6902: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com path: condition.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com path: validation.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com patch: |- - op: add path: "/metadata/labels" diff --git a/build/crd/crunchybridgeclusters/kustomization.yaml b/build/crd/crunchybridgeclusters/kustomization.yaml index 2c86faa1e5..71136a3bfd 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.pgv3.percona.com_crunchybridgeclusters.yaml +- generated/upstream.pgv2.percona.com_crunchybridgeclusters.yaml patches: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: crunchybridgeclusters.upstream.pgv3.percona.com + name: crunchybridgeclusters.upstream.pgv2.percona.com # The version below should match the version on the PostgresCluster CRD patch: |- - op: add diff --git a/build/crd/percona/generated/pgv3.percona.com_perconapgbackups.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml similarity index 99% rename from build/crd/percona/generated/pgv3.percona.com_perconapgbackups.yaml rename to build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml index a0a2294378..f2796d1628 100644 --- a/build/crd/percona/generated/pgv3.percona.com_perconapgbackups.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgbackups.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgbackups.pgv3.percona.com + name: perconapgbackups.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList diff --git a/build/crd/percona/generated/pgv3.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml similarity index 99% rename from build/crd/percona/generated/pgv3.percona.com_perconapgclusters.yaml rename to build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml index c41a0351ec..7c6e5caed3 100644 --- a/build/crd/percona/generated/pgv3.percona.com_perconapgclusters.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgclusters.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList diff --git a/build/crd/percona/generated/pgv3.percona.com_perconapgrestores.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml similarity index 99% rename from build/crd/percona/generated/pgv3.percona.com_perconapgrestores.yaml rename to build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml index 01054677a0..8cd069714e 100644 --- a/build/crd/percona/generated/pgv3.percona.com_perconapgrestores.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgrestores.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgrestores.pgv3.percona.com + name: perconapgrestores.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList diff --git a/build/crd/percona/generated/pgv3.percona.com_perconapgupgrades.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml similarity index 99% rename from build/crd/percona/generated/pgv3.percona.com_perconapgupgrades.yaml rename to build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml index ef6e3a6048..b438fd09b4 100644 --- a/build/crd/percona/generated/pgv3.percona.com_perconapgupgrades.yaml +++ b/build/crd/percona/generated/pgv2.percona.com_perconapgupgrades.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgupgrades.pgv3.percona.com + name: perconapgupgrades.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList diff --git a/build/crd/percona/kustomization.yaml b/build/crd/percona/kustomization.yaml index 6deaef033b..dc52731bcc 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/pgv3.percona.com_perconapgclusters.yaml -- generated/pgv3.percona.com_perconapgbackups.yaml -- generated/pgv3.percona.com_perconapgrestores.yaml -- generated/pgv3.percona.com_perconapgupgrades.yaml +- generated/pgv2.percona.com_perconapgclusters.yaml +- generated/pgv2.percona.com_perconapgbackups.yaml +- generated/pgv2.percona.com_perconapgrestores.yaml +- generated/pgv2.percona.com_perconapgupgrades.yaml diff --git a/build/crd/pgadmins/kustomization.yaml b/build/crd/pgadmins/kustomization.yaml index d366af89a9..199a3e974b 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.pgv3.percona.com_pgadmins.yaml +- generated/upstream.pgv2.percona.com_pgadmins.yaml patches: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgadmins.upstream.pgv3.percona.com + name: pgadmins.upstream.pgv2.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgadmins.upstream.pgv3.percona.com + name: pgadmins.upstream.pgv2.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 87a2ba7e8e..5b57138848 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.pgv3.percona.com_pgupgrades.yaml +- generated/upstream.pgv2.percona.com_pgupgrades.yaml patches: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgupgrades.upstream.pgv3.percona.com + name: pgupgrades.upstream.pgv2.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: pgupgrades.upstream.pgv3.percona.com + name: pgupgrades.upstream.pgv2.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 252c803c48..5a053e93b3 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.pgv3.percona.com_postgresclusters.yaml +- generated/upstream.pgv2.percona.com_postgresclusters.yaml patchesJson6902: - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com path: condition.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com path: todos.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com path: validation.yaml - target: group: apiextensions.k8s.io version: v1 kind: CustomResourceDefinition - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.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/postgres-operator/main.go b/cmd/postgres-operator/main.go index 383ee70461..5dd6aa5f34 100644 --- a/cmd/postgres-operator/main.go +++ b/cmd/postgres-operator/main.go @@ -46,8 +46,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var ( diff --git a/cmd/postgres-operator/main_test.go b/cmd/postgres-operator/main_test.go index 77978d168e..4e04c4af2a 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.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, + "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, }) 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.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, + "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, }) } }) @@ -143,13 +143,13 @@ func TestInitManager(t *testing.T) { assert.NilError(t, err) assert.DeepEqual(t, options.Controller.GroupKindConcurrency, map[string]int{ - "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, + "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, }) }) }) diff --git a/config/crd/bases/pgv3.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml similarity index 99% rename from config/crd/bases/pgv3.percona.com_perconapgclusters.yaml rename to config/crd/bases/pgv2.percona.com_perconapgclusters.yaml index d80e00e9cd..4b7ba54f14 100644 --- a/config/crd/bases/pgv3.percona.com_perconapgclusters.yaml +++ b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml @@ -3,9 +3,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgbackups.pgv3.percona.com + name: perconapgbackups.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -29843,9 +29843,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgrestores.pgv3.percona.com + name: perconapgrestores.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30163,9 +30163,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 - name: perconapgupgrades.pgv3.percona.com + name: perconapgupgrades.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList diff --git a/config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml b/config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml similarity index 99% rename from config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml rename to config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml index dca9951596..05029ef3ff 100644 --- a/config/crd/bases/upstream.pgv3.percona.com_crunchybridgeclusters.yaml +++ b/config/crd/bases/upstream.pgv2.percona.com_crunchybridgeclusters.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: crunchybridgeclusters.upstream.pgv3.percona.com + name: crunchybridgeclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList diff --git a/config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml b/config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml similarity index 99% rename from config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml rename to config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml index 56af762534..532ccfaeba 100644 --- a/config/crd/bases/upstream.pgv3.percona.com_pgadmins.yaml +++ b/config/crd/bases/upstream.pgv2.percona.com_pgadmins.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv3.percona.com + name: pgadmins.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGAdmin listKind: PGAdminList diff --git a/config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml b/config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml similarity index 99% rename from config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml rename to config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml index 2603b51e3a..1a16db6750 100644 --- a/config/crd/bases/upstream.pgv3.percona.com_pgupgrades.yaml +++ b/config/crd/bases/upstream.pgv2.percona.com_pgupgrades.yaml @@ -6,9 +6,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv3.percona.com + name: pgupgrades.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGUpgrade listKind: PGUpgradeList diff --git a/config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml b/config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml similarity index 99% rename from config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml rename to config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml index 6a1a71172d..e8ba977e3c 100644 --- a/config/crd/bases/upstream.pgv3.percona.com_postgresclusters.yaml +++ b/config/crd/bases/upstream.pgv2.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.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PostgresCluster listKind: PostgresClusterList diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 3b4da571e2..89152620f1 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.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 +- 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 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 12377cda4a..011f646c10 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.pgv3.percona.com + name: perconapgbackups.pgv2.percona.com labels: - pgv3.percona.com/version: v3.1.0 + pgv2.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 7c9013fc94..d7b16fc81f 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com labels: - pgv3.percona.com/version: v3.1.0 + pgv2.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 6398071583..8517135fca 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.pgv3.percona.com + name: perconapgrestores.pgv2.percona.com labels: - pgv3.percona.com/version: v3.1.0 + pgv2.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 66b7f595ed..9c86cfbd17 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.pgv3.percona.com + name: perconapgupgrades.pgv2.percona.com labels: - pgv3.percona.com/version: v3.1.0 + pgv2.percona.com/version: v3.1.0 diff --git a/config/manager/default/kustomization.yaml b/config/manager/default/kustomization.yaml index efeaabde93..a04f73c25d 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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator diff --git a/config/rbac/cluster/role.yaml b/config/rbac/cluster/role.yaml index fe5185a7b6..462ac735b9 100644 --- a/config/rbac/cluster/role.yaml +++ b/config/rbac/cluster/role.yaml @@ -122,7 +122,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups verbs: @@ -134,7 +134,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -146,7 +146,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/status verbs: @@ -154,7 +154,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters - perconapgupgrades @@ -166,13 +166,13 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgrestores verbs: @@ -225,7 +225,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters verbs: @@ -235,7 +235,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -243,7 +243,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins verbs: @@ -251,7 +251,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -259,14 +259,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgupgrades - postgresclusters @@ -279,7 +279,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - postgresclusters/status verbs: diff --git a/config/rbac/namespace/role.yaml b/config/rbac/namespace/role.yaml index 6cdb1a6046..5361ec1a72 100644 --- a/config/rbac/namespace/role.yaml +++ b/config/rbac/namespace/role.yaml @@ -122,7 +122,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups verbs: @@ -134,7 +134,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -146,7 +146,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/status verbs: @@ -154,7 +154,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters - perconapgupgrades @@ -166,13 +166,13 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgrestores verbs: @@ -225,7 +225,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters verbs: @@ -235,7 +235,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -243,7 +243,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins verbs: @@ -251,7 +251,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -259,14 +259,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgupgrades - postgresclusters @@ -279,7 +279,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - postgresclusters/status verbs: diff --git a/deploy/backup.yaml b/deploy/backup.yaml index 255ee138c5..8f9a9c347a 100644 --- a/deploy/backup.yaml +++ b/deploy/backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup metadata: name: backup1 diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 5c95a4cb46..daf2c71eda 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.pgv3.percona.com + name: crunchybridgeclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList @@ -297,10 +297,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgbackups.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgbackups.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -998,10 +998,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgclusters.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -30141,10 +30141,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgrestores.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgrestores.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30463,10 +30463,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgupgrades.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgupgrades.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList @@ -33271,9 +33271,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv3.percona.com + name: pgadmins.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGAdmin listKind: PGAdminList @@ -35289,9 +35289,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv3.percona.com + name: pgupgrades.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGUpgrade listKind: PGUpgradeList @@ -38082,9 +38082,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PostgresCluster listKind: PostgresClusterList @@ -69336,7 +69336,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups verbs: @@ -69348,7 +69348,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -69360,7 +69360,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/status verbs: @@ -69368,7 +69368,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters - perconapgupgrades @@ -69380,13 +69380,13 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgrestores verbs: @@ -69439,7 +69439,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters verbs: @@ -69449,7 +69449,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -69457,7 +69457,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins verbs: @@ -69465,7 +69465,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -69473,14 +69473,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgupgrades - postgresclusters @@ -69493,7 +69493,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - postgresclusters/status verbs: @@ -69521,7 +69521,7 @@ metadata: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator name: percona-postgresql-operator spec: replicas: 1 @@ -69531,7 +69531,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator strategy: type: Recreate template: @@ -69541,7 +69541,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 4285af9e92..e6d71f7858 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: cluster1 diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 817e0289b0..7f62e7dc09 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.pgv3.percona.com + name: crunchybridgeclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList @@ -297,10 +297,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgbackups.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgbackups.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -998,10 +998,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgclusters.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -30141,10 +30141,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgrestores.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgrestores.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30463,10 +30463,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgupgrades.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgupgrades.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList @@ -33271,9 +33271,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv3.percona.com + name: pgadmins.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGAdmin listKind: PGAdminList @@ -35289,9 +35289,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv3.percona.com + name: pgupgrades.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGUpgrade listKind: PGUpgradeList @@ -38082,9 +38082,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PostgresCluster listKind: PostgresClusterList diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 79e2074009..18d52b5025 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.pgv3.percona.com + name: crunchybridgeclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: CrunchyBridgeCluster listKind: CrunchyBridgeClusterList @@ -297,10 +297,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgbackups.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgbackups.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGBackup listKind: PerconaPGBackupList @@ -998,10 +998,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgclusters.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGCluster listKind: PerconaPGClusterList @@ -30141,10 +30141,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgrestores.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgrestores.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGRestore listKind: PerconaPGRestoreList @@ -30463,10 +30463,10 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv3.percona.com/version: v3.1.0 - name: perconapgupgrades.pgv3.percona.com + pgv2.percona.com/version: v3.1.0 + name: perconapgupgrades.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.percona.com names: kind: PerconaPGUpgrade listKind: PerconaPGUpgradeList @@ -33271,9 +33271,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgadmins.upstream.pgv3.percona.com + name: pgadmins.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGAdmin listKind: PGAdminList @@ -35289,9 +35289,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: latest - name: pgupgrades.upstream.pgv3.percona.com + name: pgupgrades.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PGUpgrade listKind: PGUpgradeList @@ -38082,9 +38082,9 @@ metadata: labels: app.kubernetes.io/name: pgo app.kubernetes.io/version: 5.4.2 - name: postgresclusters.upstream.pgv3.percona.com + name: postgresclusters.upstream.pgv2.percona.com spec: - group: upstream.pgv3.percona.com + group: upstream.pgv2.percona.com names: kind: PostgresCluster listKind: PostgresClusterList @@ -69336,7 +69336,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups verbs: @@ -69348,7 +69348,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -69360,7 +69360,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/status verbs: @@ -69368,7 +69368,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters - perconapgupgrades @@ -69380,13 +69380,13 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgrestores verbs: @@ -69439,7 +69439,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters verbs: @@ -69449,7 +69449,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -69457,7 +69457,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins verbs: @@ -69465,7 +69465,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -69473,14 +69473,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgupgrades - postgresclusters @@ -69493,7 +69493,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - postgresclusters/status verbs: @@ -69522,7 +69522,7 @@ metadata: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator name: percona-postgresql-operator spec: replicas: 1 @@ -69532,7 +69532,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator strategy: type: Recreate template: @@ -69542,7 +69542,7 @@ spec: app.kubernetes.io/instance: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql-operator app.kubernetes.io/part-of: percona-postgresql-operator - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml index 366fb8f350..48a7758660 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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/cw-rbac.yaml b/deploy/cw-rbac.yaml index 13dbbe2dcf..1072b497e1 100644 --- a/deploy/cw-rbac.yaml +++ b/deploy/cw-rbac.yaml @@ -126,7 +126,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups verbs: @@ -138,7 +138,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -150,7 +150,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/status verbs: @@ -158,7 +158,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters - perconapgupgrades @@ -170,13 +170,13 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgrestores verbs: @@ -229,7 +229,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters verbs: @@ -239,7 +239,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -247,7 +247,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins verbs: @@ -255,7 +255,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -263,14 +263,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgupgrades - postgresclusters @@ -283,7 +283,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - postgresclusters/status verbs: diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 598f0af511..f7f95a0886 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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.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 - pgv3.percona.com/control-plane: postgres-operator + pgv2.percona.com/control-plane: postgres-operator spec: containers: - env: diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml index 960b3170b1..c815cb520a 100644 --- a/deploy/rbac.yaml +++ b/deploy/rbac.yaml @@ -126,7 +126,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups verbs: @@ -138,7 +138,7 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/finalizers - perconapgclusters/status @@ -150,7 +150,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgbackups/status verbs: @@ -158,7 +158,7 @@ rules: - patch - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters - perconapgupgrades @@ -170,13 +170,13 @@ rules: - update - watch - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgclusters/finalizers verbs: - update - apiGroups: - - pgv3.percona.com + - pgv2.percona.com resources: - perconapgrestores verbs: @@ -229,7 +229,7 @@ rules: - patch - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters verbs: @@ -239,7 +239,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - crunchybridgeclusters/finalizers - crunchybridgeclusters/status @@ -247,7 +247,7 @@ rules: - patch - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins verbs: @@ -255,7 +255,7 @@ rules: - list - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/finalizers - pgupgrades/finalizers @@ -263,14 +263,14 @@ rules: verbs: - update - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgadmins/status - pgupgrades/status verbs: - patch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - pgupgrades - postgresclusters @@ -283,7 +283,7 @@ rules: - update - watch - apiGroups: - - upstream.pgv3.percona.com + - upstream.pgv2.percona.com resources: - postgresclusters/status verbs: diff --git a/deploy/restore.yaml b/deploy/restore.yaml index 7206522f31..c1a31acbe6 100644 --- a/deploy/restore.yaml +++ b/deploy/restore.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGRestore metadata: name: restore1 diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml index 3d9b3e0fd2..4c3126e416 100644 --- a/deploy/upgrade.yaml +++ b/deploy/upgrade.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 2a33771836..2d96987abf 100644 --- a/docs/content/references/crd.md +++ b/docs/content/references/crd.md @@ -6,10 +6,10 @@ weight: 100 Packages: -- [pgv3.percona.com/v2](#pgv3perconacomv2) -- [upstream.pgv3.percona.com/v1beta1](#postgres-operatorcrunchydatacomv1beta1) +- [pgv2.percona.com/v2](#pgv2perconacomv2) +- [upstream.pgv2.percona.com/v1beta1](#postgres-operatorcrunchydatacomv1beta1) -

pgv3.percona.com/v2

+

pgv2.percona.com/v2

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

upstream.pgv3.percona.com/v1beta1

+

upstream.pgv2.percona.com/v1beta1

Resource Types: @@ -25960,7 +25960,7 @@ PGUpgrade is the Schema for the pgupgrades API apiVersion string - upstream.pgv3.percona.com/v1beta1 + upstream.pgv2.percona.com/v1beta1 true @@ -27794,7 +27794,7 @@ PostgresCluster is the Schema for the postgresclusters API apiVersion string - upstream.pgv3.percona.com/v1beta1 + upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 64be08f5de..f361720906 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: some-name controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 56362d3730..1bb711ae0b 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -54,7 +54,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: some-name controller: true @@ -109,7 +109,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 19f1a663c1..25990eea10 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -42,12 +42,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: some-name-datasource controller: true @@ -66,7 +66,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 d735814c8b..ab630db07d 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: some-name-datasource controller: true @@ -108,7 +108,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 e7ecbc3eb7..67b8e41bd1 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name-datasource controller: true @@ -42,12 +42,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name-datasource ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: some-name-datasource controller: true @@ -69,7 +69,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 ddebabcf3d..1fc95bbce8 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."pgv3.percona.com/authorizeBackupRemoval"="true"' \ + | yq '.metadata.annotations."pgv2.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 fa7dfe7d08..44365b2f3e 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: some-name controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: some-name ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: some-name controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 164ad035c0..5d271cd318 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."pgv3.percona.com/authorizeBackupRemoval"="true"' \ + | yq '.metadata.annotations."pgv2.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 dbd3e6f5f0..f61b6d35e9 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.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 d6c270dc74..8a571cd9f0 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."pgv3.percona.com/authorizeBackupRemoval")' \ + | yq 'del(.metadata.annotations."pgv2.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 eab8d7fbed..a00aa45aec 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."pgv3.percona.com/authorizeBackupRemoval")' \ + | yq 'del(.metadata.annotations."pgv2.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 938f41550a..64ee90a823 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name-datasource -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 361e1a416c..b2093ea365 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: some-name -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 4a3ffb5fc3..733eaca8bb 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 2cb32b3bea..1b58fb3abd 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 7f6673405c..f6b38bab98 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 8128879b94..341741efa8 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 01053e469f..c9fb037b2a 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 34323eb61f..ebdc452ab4 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 3694f6bcd3..0b9bd23ed9 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: builtin-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: builtin-extensions ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: builtin-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 738f0d47be..827cde4fa5 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 d8ac70137c..fa74f2e991 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: builtin-extensions -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 7cf832ff36..72235e683b 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 ee8b5aad00..99d26e99b8 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 17f5a3e3b9..3fa4968d67 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: cert-manager-tls ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: cert-manager-tls controller: true @@ -86,7 +86,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 f3f6168814..dbc10adc6d 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: cert-manager-tls -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 a75fe54940..c63a6c0675 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-envs controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 84fefd2720..c4dc5b5167 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 d8782ab864..12a35017e5 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 3b2f131e5b..a83e6107d8 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 bb157e9e8b..1d8e958dc3 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 0b4894fe25..0b5d89e541 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 f465006d2c..14e7190ae8 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -30,7 +30,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 8bd02ff352..fbbf0f286f 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 a2200289e2..9840473223 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 b87dc7e4c3..bf901f4336 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 13d04f8b3c..49c301c3e9 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 50d974d45a..2971f22838 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 6b58823e9d..cdf16b7821 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 9171b503c4..0f6da60ff3 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 429ada660c..b49c7632b2 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 d98fa5d257..fec1c1abed 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 a26ceb6c9e..5fb98a1942 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 194438b513..1d2316bb93 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 fa0ae8cabf..ebb2f044cf 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 9a6bf7dd9a..652c4fb71f 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 a1d88acc64..2c1e2d716b 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 56758d1ba6..d4deaf9896 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-envs ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-envs controller: true @@ -26,7 +26,7 @@ status: readyReplicas: 1 replicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 96024891a8..b2d5900099 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: one-pod -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 587418552c..bc775f0b59 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-extensions ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-extensions controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 1d085941ad..99203d349a 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -68,7 +68,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 4588331a8b..9f0fb7ccaf 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 1d085941ad..99203d349a 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -68,7 +68,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 a2dcb64e74..cfb18a5cbb 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 4694c56765..6e5185058f 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 1a4a1f186a..aef7ad7e6f 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -34,7 +34,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 70d29f9140..b01537719e 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -55,7 +55,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-extensions ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-extensions controller: true @@ -116,7 +116,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 befb147bde..7183fcf975 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 4588331a8b..9f0fb7ccaf 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 befb147bde..7183fcf975 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 177a53e5a7..2099e58a74 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 9e50a98025..8c2a26d3ab 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-extensions controller: true @@ -56,7 +56,7 @@ status: readyReplicas: 1 availableReplicas: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 5d3b478b3e..43e828dd51 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-extensions -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 cf99ace30f..9555f406cf 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 7af9c436ec..3e4e660938 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-tls controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 fbd7c973fc..2db32e5ffc 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -31,7 +31,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '2' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -41,12 +41,12 @@ spec: status: observedGeneration: 2 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-tls controller: true @@ -56,7 +56,7 @@ metadata: status: observedGeneration: 2 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 dc0c5b4286..5c16624a13 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -32,7 +32,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '3' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: custom-tls controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: custom-tls ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: custom-tls controller: true @@ -71,7 +71,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 58ef9bbcf1..c9fb138f39 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: custom-tls -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 e8e482a44e..f21290ec4a 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: database-init-sql controller: true @@ -43,12 +43,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: database-init-sql ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: database-init-sql controller: true @@ -70,7 +70,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 59096e979c..0880d02376 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: database-init-sql -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 fcf5f36f4e..917bc14ce2 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: backup-snapshot controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: backup-snapshot ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: backup-snapshot controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 cd2743dc76..bbb4a9b018 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: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup metadata: name: backup1 @@ -20,7 +20,7 @@ apiVersion: snapshot.storage.k8s.io/v1 metadata: name: backup1-pgdata ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.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 db44d72b52..ab38603357 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 c177c07609..ec2c619a09 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: - pgv3.percona.com/snapshot-restore: restore1 + pgv2.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: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGRestore metadata: name: restore1 status: state: Succeeded --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 6c18b1b4cc..9b537d9f39 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 pgv3.percona.com/cluster-bootstrap-restore=true when +# with annotation pgv2.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: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGRestore metadata: name: percona-restored-bootstrap annotations: - pgv3.percona.com/cluster-bootstrap-restore: "true" + pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: percona-restored ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: percona-restored controller: true @@ -63,7 +63,7 @@ status: finished: true succeeded: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 7ef402a5e1..efa47905c3 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 953873b747..e6c87ad00d 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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 06733d7d5b..a2fb9cea71 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 54104d502f..13df5dc5da 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: pgv3.percona.com/v2 +apiVersion: pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 +apiVersion: pgv2.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 ef52080d3c..5f712a9738 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: pgv3.percona.com/v2 + apiVersion: pgv2.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 8b3e710fa9..04ac75c4eb 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: scheduled-backup generation: 13 ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: scheduled-backup controller: true @@ -40,7 +40,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 07b4a7e317..fdd72d0423 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: pgv3.percona.com/v2 + apiVersion: pgv2.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 fa68d00f15..818916ddcf 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: scheduled-backup generation: 15 ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: scheduled-backup controller: true @@ -40,7 +40,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 00f0286a14..79dfcdc769 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: pgv3.percona.com/v2 + apiVersion: pgv2.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 5aa9fe0819..771ef5661b 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: scheduled-backup -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 024c59b221..978bb2d78c 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 76caa38164..2e418daaaf 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 f064a5f4b6..e2fe1ee5df 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 68d374df67..8e4f5a5f3d 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 68d374df67..8e4f5a5f3d 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 68d374df67..8e4f5a5f3d 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 68d374df67..8e4f5a5f3d 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: self-healing controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: self-healing ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: self-healing controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 77eddc2b59..7e5e4620c4 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 7202c9e7ce..9467d0a230 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: sidecars controller: true @@ -56,7 +56,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: sidecars ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: sidecars controller: true @@ -117,7 +117,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 - pgv3.percona.com/version: 3.1.0 + pgv2.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 8cd497fda2..8ae7e18df1 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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: self-healing - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 247c87d1e9..9b80c796d3 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: source-cluster ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: source-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 f8f6847411..c9e8e72dfd 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["pgv3.percona.com/replication-main-site"]}'="${NAMESPACE}"/source-cluster --timeout=480s -n "${NAMESPACE}" pg/standby-cluster + kubectl wait --for=jsonpath='{.metadata.annotations["pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster controller: true @@ -44,12 +44,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -71,7 +71,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 8e81a5c632..87b803c035 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 3e6e68249d..82e668d093 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: source-cluster -- apiVersion: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 16e37513a5..19c553d45c 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 31e22f0bcd..5bca8ea149 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 001f96c866..f8b99bd706 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 7d12792227..adfac6c34e 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 247c87d1e9..9b80c796d3 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: source-cluster ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: source-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 f8f6847411..c9e8e72dfd 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["pgv3.percona.com/replication-main-site"]}'="${NAMESPACE}"/source-cluster --timeout=480s -n "${NAMESPACE}" pg/standby-cluster + kubectl wait --for=jsonpath='{.metadata.annotations["pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: standby-cluster controller: true @@ -44,12 +44,12 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -71,7 +71,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 8e81a5c632..87b803c035 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: standby-cluster ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: standby-cluster controller: true @@ -85,7 +85,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 3e6e68249d..82e668d093 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: source-cluster -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: source-cluster -- apiVersion: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: standby-cluster -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 7cf832ff36..72235e683b 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 124efa27ce..c82daeba9b 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: start-from-backup-source ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: start-from-backup-source controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 c542ab6cde..6acec781d3 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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup metadata: name: start-from-backup-source-full-repo1 @@ -30,7 +30,7 @@ spec: status: state: Succeeded --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.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 72ee654546..bff684f703 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 4372d9d8cf..b85650b356 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: start-from-backup-source -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 40fad5b882..bdda45643b 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: start-from-backup ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: start-from-backup controller: true @@ -91,7 +91,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup @@ -108,7 +108,7 @@ status: size: 3 state: ready --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 5e8cd77571..bf732320bb 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: pgv3.percona.com/v2 +- apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: start-from-backup -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.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 213c92987c..46bb81bfdc 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 ada4eb43ff..047c836728 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 6284ee6cb6..02c7014cc7 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 d77996a240..49012798e6 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: pgv3.percona.com/v2 +apiVersion: pgv2.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 c35ff62c91..ae5a062d84 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.pgv3.percona.com + name: perconapgclusters.pgv2.percona.com spec: - group: pgv3.percona.com + group: pgv2.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 1e1b3a0005..a97cb5e5d8 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.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: tablespaces controller: true @@ -33,7 +33,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: tablespaces ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: tablespaces controller: true @@ -88,7 +88,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 ac63c295b7..707df43209 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: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup controller: true blockOwnerDeletion: true status: succeeded: 1 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 b6a15cf386..df0ed18190 100644 --- a/e2e-tests/tests/tablespaces/05-create-backup.yaml +++ b/e2e-tests/tests/tablespaces/05-create-backup.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 ef7b0f0009..e6292cd6df 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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: tablespaces generation: 4 ownerReferences: - - apiVersion: pgv3.percona.com/v2 + - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster name: tablespaces controller: true @@ -36,7 +36,7 @@ status: readyReplicas: 3 replicas: 3 --- -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.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 9be722311d..8ab23dde7d 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.pgv2.percona.com_postgresclusters.yaml" > "${clusters_dir}/todos.yaml" # shellcheck disable=SC2016 python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_without_todo}" ' @@ -54,4 +54,4 @@ python3 -m yq -y --arg old "${name_desc_with_todo}" --arg new "${name_desc_witho [paths(select(. == $old)) | { op: "copy", from: "/work", path: "/\(map(tostring) | join("/"))" }] + [{ op: "remove", path: "/work" }] ' \ - "${upgrades_dir}/generated/upstream.pgv3.percona.com_pgupgrades.yaml" > "${upgrades_dir}/todos.yaml" + "${upgrades_dir}/generated/upstream.pgv2.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 ff872935ec..c9541913ed 100644 --- a/installers/olm/config/examples/pgadmin.example.yaml +++ b/installers/olm/config/examples/pgadmin.example.yaml @@ -1,4 +1,4 @@ -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.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 740d212b83..6465eadf02 100644 --- a/installers/olm/config/examples/pgupgrade.example.yaml +++ b/installers/olm/config/examples/pgupgrade.example.yaml @@ -1,4 +1,4 @@ -apiVersion: upstream.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.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 b4969a8fa2..63bd9abca4 100644 --- a/installers/olm/config/examples/postgrescluster.example.yaml +++ b/installers/olm/config/examples/postgrescluster.example.yaml @@ -1,4 +1,4 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: example diff --git a/internal/bridge/client.go b/internal/bridge/client.go index 9cbf658828..fdad90f5d7 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 18c2b2ab2f..fe022aeea6 100644 --- a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go +++ b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // CrunchyBridgeClusterReconciler reconciles a CrunchyBridgeCluster object @@ -42,7 +42,7 @@ type CrunchyBridgeClusterReconciler struct { NewClient func() bridge.ClientInterface } -//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="crunchybridgeclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="crunchybridgeclusters/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv2.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.Scheme()) } -//+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="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="",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 d7d51e6af9..51844e53f9 100644 --- a/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go +++ b/internal/bridge/crunchybridgecluster/crunchybridgecluster_controller_test.go @@ -23,7 +23,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var testTeamId = "5678" diff --git a/internal/bridge/crunchybridgecluster/delete.go b/internal/bridge/crunchybridgecluster/delete.go index 710d9b0195..778921ebd0 100644 --- a/internal/bridge/crunchybridgecluster/delete.go +++ b/internal/bridge/crunchybridgecluster/delete.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const finalizer = "crunchybridgecluster.postgres-operator.crunchydata.com/finalizer" diff --git a/internal/bridge/crunchybridgecluster/helpers_test.go b/internal/bridge/crunchybridgecluster/helpers_test.go index 2f8175818e..55f4fbf75d 100644 --- a/internal/bridge/crunchybridgecluster/helpers_test.go +++ b/internal/bridge/crunchybridgecluster/helpers_test.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 f568b7d196..40ced78dd9 100644 --- a/internal/bridge/crunchybridgecluster/mock_bridge_api.go +++ b/internal/bridge/crunchybridgecluster/mock_bridge_api.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "github.com/percona/percona-postgresql-operator/v3/internal/bridge" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type TestBridgeClient struct { diff --git a/internal/bridge/crunchybridgecluster/postgres.go b/internal/bridge/crunchybridgecluster/postgres.go index c6f7802264..1af2f07d64 100644 --- a/internal/bridge/crunchybridgecluster/postgres.go +++ b/internal/bridge/crunchybridgecluster/postgres.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 de41a948b6..a5c4ed273b 100644 --- a/internal/bridge/crunchybridgecluster/postgres_test.go +++ b/internal/bridge/crunchybridgecluster/postgres_test.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGeneratePostgresRoleSecret(t *testing.T) { diff --git a/internal/bridge/crunchybridgecluster/watches.go b/internal/bridge/crunchybridgecluster/watches.go index 5219e41a19..1de380ad88 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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.pgv3.percona.com",resources="crunchybridgeclusters",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="crunchybridgeclusters",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="crunchybridgeclusters",verbs={list} // Watch enqueues all existing CrunchyBridgeClusters for reconciles. func (r *CrunchyBridgeClusterReconciler) Watch() handler.EventHandler { diff --git a/internal/config/config.go b/internal/config/config.go index 087fb5cd9e..5ec351c4a6 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 fb06c99579..62570330d1 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestFetchKeyCommand(t *testing.T) { diff --git a/internal/controller/pgupgrade/jobs.go b/internal/controller/pgupgrade/jobs.go index d9af543c65..b07f50d06b 100644 --- a/internal/controller/pgupgrade/jobs.go +++ b/internal/controller/pgupgrade/jobs.go @@ -20,7 +20,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // Upgrade job diff --git a/internal/controller/pgupgrade/jobs_test.go b/internal/controller/pgupgrade/jobs_test.go index d8ecee3ce0..e6b5a71fa5 100644 --- a/internal/controller/pgupgrade/jobs_test.go +++ b/internal/controller/pgupgrade/jobs_test.go @@ -18,7 +18,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestLargestWholeCPU(t *testing.T) { @@ -155,7 +155,7 @@ metadata: name: pgu2-pgdata namespace: ns1 ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PGUpgrade @@ -307,7 +307,7 @@ metadata: name: pgu2-sts namespace: ns1 ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PGUpgrade diff --git a/internal/controller/pgupgrade/labels.go b/internal/controller/pgupgrade/labels.go index 6d02f52643..f1f9b438fd 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/controller/pgupgrade/pgupgrade_controller.go b/internal/controller/pgupgrade/pgupgrade_controller.go index f5df84c847..ff01c878f5 100644 --- a/internal/controller/pgupgrade/pgupgrade_controller.go +++ b/internal/controller/pgupgrade/pgupgrade_controller.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( @@ -41,8 +41,8 @@ type PGUpgradeReconciler struct { } //+kubebuilder:rbac:groups="batch",resources="jobs",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} +//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgupgrades",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="pgupgrades",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="pgupgrades",verbs={get} -//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgupgrades/status",verbs={patch} +//+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="batch",resources="jobs",verbs={delete} -//+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="upstream.pgv2.percona.com",resources="postgresclusters",verbs={get} +//+kubebuilder:rbac:groups="upstream.pgv2.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 30dca7fa36..35b43c9662 100644 --- a/internal/controller/pgupgrade/registration.go +++ b/internal/controller/pgupgrade/registration.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "github.com/percona/percona-postgresql-operator/v3/internal/registration" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 ac0d119157..bd72d6eeac 100644 --- a/internal/controller/pgupgrade/registration_test.go +++ b/internal/controller/pgupgrade/registration_test.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestUpgradeAuthorized(t *testing.T) { diff --git a/internal/controller/pgupgrade/utils.go b/internal/controller/pgupgrade/utils.go index f212e009b0..483b5dce84 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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.pgv3.percona.com",resources="pgupgrades/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv2.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 d79ba67cd9..89951408d7 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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.pgv3.percona.com",resources="postgresclusters",verbs={get,watch} +//+kubebuilder:rbac:groups="upstream.pgv2.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 408b2cca98..82ecc94371 100644 --- a/internal/controller/pgupgrade/world_test.go +++ b/internal/controller/pgupgrade/world_test.go @@ -15,7 +15,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestPopulateCluster(t *testing.T) { diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go index 1997396c38..0c4bd50395 100644 --- a/internal/controller/postgrescluster/cluster.go +++ b/internal/controller/postgrescluster/cluster.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 ffea809603..838e2b9bbc 100644 --- a/internal/controller/postgrescluster/cluster_test.go +++ b/internal/controller/postgrescluster/cluster_test.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var gvks = []runtime.GVK{{ @@ -613,7 +613,7 @@ labels: name: pg5-primary namespace: ns2 ownerReferences: -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -646,7 +646,7 @@ metadata: name: pg5-primary namespace: ns2 ownerReferences: - - apiVersion: upstream.pgv3.percona.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -745,7 +745,7 @@ labels: name: pg2-replicas namespace: ns1 ownerReferences: -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/controller.go b/internal/controller/postgrescluster/controller.go index bbfb35c6f0..da5b0d4c1e 100644 --- a/internal/controller/postgrescluster/controller.go +++ b/internal/controller/postgrescluster/controller.go @@ -57,7 +57,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( @@ -84,8 +84,8 @@ type Reconciler struct { } // +kubebuilder:rbac:groups="",resources="events",verbs={create,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} +// +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} // Reconcile reconciles a ConfigMap in a namespace managed by the PostgreSQL Operator func (r *Reconciler) Reconcile( @@ -517,7 +517,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.pgv3.percona.com",resources="postgresclusters/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv2.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 11e336896c..bc81204258 100644 --- a/internal/controller/postgrescluster/controller_ref_manager.go +++ b/internal/controller/postgrescluster/controller_ref_manager.go @@ -20,7 +20,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // adoptObject adopts the provided Object by adding controller owner refs for the provided diff --git a/internal/controller/postgrescluster/controller_test.go b/internal/controller/postgrescluster/controller_test.go index 78e4495858..8c48c66362 100644 --- a/internal/controller/postgrescluster/controller_test.go +++ b/internal/controller/postgrescluster/controller_test.go @@ -33,7 +33,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestDeleteControlled(t *testing.T) { diff --git a/internal/controller/postgrescluster/delete.go b/internal/controller/postgrescluster/delete.go index f98dd69a55..7eee51665b 100644 --- a/internal/controller/postgrescluster/delete.go +++ b/internal/controller/postgrescluster/delete.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/percona/percona-postgresql-operator/v3/internal/naming" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) -// +kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={patch} +// +kubebuilder:rbac:groups="upstream.pgv2.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 9e8555d376..101f9aea66 100644 --- a/internal/controller/postgrescluster/helpers_test.go +++ b/internal/controller/postgrescluster/helpers_test.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var ( diff --git a/internal/controller/postgrescluster/instance.go b/internal/controller/postgrescluster/instance.go index b2ce86842d..7da2cf5bf8 100644 --- a/internal/controller/postgrescluster/instance.go +++ b/internal/controller/postgrescluster/instance.go @@ -40,7 +40,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 c604831023..7156b1fbc5 100644 --- a/internal/controller/postgrescluster/instance_rollout_test.go +++ b/internal/controller/postgrescluster/instance_rollout_test.go @@ -25,7 +25,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 69888f22b9..a056ab7798 100644 --- a/internal/controller/postgrescluster/instance_test.go +++ b/internal/controller/postgrescluster/instance_test.go @@ -40,7 +40,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestInstanceIsRunning(t *testing.T) { diff --git a/internal/controller/postgrescluster/patroni.go b/internal/controller/postgrescluster/patroni.go index 92c1e255ba..4f3f91e75b 100644 --- a/internal/controller/postgrescluster/patroni.go +++ b/internal/controller/postgrescluster/patroni.go @@ -22,7 +22,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 bf9b688c85..f824b81984 100644 --- a/internal/controller/postgrescluster/patroni_test.go +++ b/internal/controller/postgrescluster/patroni_test.go @@ -27,7 +27,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGeneratePatroniLeaderLeaseService(t *testing.T) { @@ -64,7 +64,7 @@ labels: name: pg2-ha namespace: ns1 ownerReferences: -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/pgadmin.go b/internal/controller/postgrescluster/pgadmin.go index fb66d18574..b2547269d8 100644 --- a/internal/controller/postgrescluster/pgadmin.go +++ b/internal/controller/postgrescluster/pgadmin.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 3c8b034dc2..5a313e2670 100644 --- a/internal/controller/postgrescluster/pgadmin_test.go +++ b/internal/controller/postgrescluster/pgadmin_test.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGeneratePGAdminConfigMap(t *testing.T) { @@ -83,7 +83,7 @@ labels: name: pg1-pgadmin namespace: some-ns ownerReferences: -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster @@ -178,7 +178,7 @@ labels: name: my-cluster-pgadmin namespace: my-ns ownerReferences: -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go index 77f24dd141..c70df7358f 100644 --- a/internal/controller/postgrescluster/pgbackrest.go +++ b/internal/controller/postgrescluster/pgbackrest.go @@ -43,8 +43,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go index 544404b206..eff84be9f3 100644 --- a/internal/controller/postgrescluster/pgbackrest_test.go +++ b/internal/controller/postgrescluster/pgbackrest_test.go @@ -43,8 +43,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var testCronSchedule string = "*/15 * * * *" @@ -2099,7 +2099,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 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", + 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", }, }, { desc: "global/configuration set", @@ -2116,7 +2116,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 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", + 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", }, }, { desc: "invalid option: stanza", @@ -2131,7 +2131,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 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", + 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", }, }, { desc: "cluster bootstrapped init condition missing", @@ -2150,7 +2150,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 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", + 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", }, }} diff --git a/internal/controller/postgrescluster/pgbouncer.go b/internal/controller/postgrescluster/pgbouncer.go index 7bb36e3fc7..b573cac1a3 100644 --- a/internal/controller/postgrescluster/pgbouncer.go +++ b/internal/controller/postgrescluster/pgbouncer.go @@ -26,7 +26,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 43ec946860..fcee8aa6d2 100644 --- a/internal/controller/postgrescluster/pgbouncer_test.go +++ b/internal/controller/postgrescluster/pgbouncer_test.go @@ -22,7 +22,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGeneratePGBouncerService(t *testing.T) { @@ -83,7 +83,7 @@ labels: name: pg7-pgbouncer namespace: ns5 ownerReferences: -- apiVersion: upstream.pgv3.percona.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 blockOwnerDeletion: true controller: true kind: PostgresCluster diff --git a/internal/controller/postgrescluster/pgmonitor.go b/internal/controller/postgrescluster/pgmonitor.go index f54ed2c430..37b58a5b07 100644 --- a/internal/controller/postgrescluster/pgmonitor.go +++ b/internal/controller/postgrescluster/pgmonitor.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 e1578823cf..b7d4b5cc09 100644 --- a/internal/controller/postgrescluster/pgmonitor_test.go +++ b/internal/controller/postgrescluster/pgmonitor_test.go @@ -25,7 +25,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 25772e8147..0b6de10014 100644 --- a/internal/controller/postgrescluster/pki.go +++ b/internal/controller/postgrescluster/pki.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/controller/postgrescluster/pki_test.go b/internal/controller/postgrescluster/pki_test.go index 70bfc3f906..a15225a1bc 100644 --- a/internal/controller/postgrescluster/pki_test.go +++ b/internal/controller/postgrescluster/pki_test.go @@ -26,7 +26,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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.OwnerReferences) == 1, "first owner reference not set") expectedOR := metav1.OwnerReference{ - APIVersion: "upstream.pgv3.percona.com/v1beta1", + APIVersion: "upstream.pgv2.percona.com/v1beta1", Kind: "PostgresCluster", Name: "hippocluster1", UID: cluster1.UID, @@ -130,7 +130,7 @@ func TestReconcileCerts(t *testing.T) { assert.Check(t, len(cluster2CASecret.OwnerReferences) == 1, "should be single owner reference") expectedOR := metav1.OwnerReference{ - APIVersion: "upstream.pgv3.percona.com/v1beta1", + APIVersion: "upstream.pgv2.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 649dac90d7..c7c7b52ac4 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 a3e36cc265..1a4fd24e69 100644 --- a/internal/controller/postgrescluster/pod_disruption_budget_test.go +++ b/internal/controller/postgrescluster/pod_disruption_budget_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGeneratePodDisruptionBudget(t *testing.T) { diff --git a/internal/controller/postgrescluster/postgres.go b/internal/controller/postgrescluster/postgres.go index ea97f8e579..aa17ffd0d5 100644 --- a/internal/controller/postgrescluster/postgres.go +++ b/internal/controller/postgrescluster/postgres.go @@ -43,7 +43,7 @@ import ( 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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 f260327c41..4f2ab873be 100644 --- a/internal/controller/postgrescluster/postgres_test.go +++ b/internal/controller/postgrescluster/postgres_test.go @@ -31,7 +31,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGeneratePostgresUserSecret(t *testing.T) { diff --git a/internal/controller/postgrescluster/rbac.go b/internal/controller/postgrescluster/rbac.go index db22234949..c4b6311dc3 100644 --- a/internal/controller/postgrescluster/rbac.go +++ b/internal/controller/postgrescluster/rbac.go @@ -13,7 +13,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 e6e2965c42..27af823c96 100644 --- a/internal/controller/postgrescluster/snapshots.go +++ b/internal/controller/postgrescluster/snapshots.go @@ -25,7 +25,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 6b30222cbd..a30c4d5461 100644 --- a/internal/controller/postgrescluster/snapshots_test.go +++ b/internal/controller/postgrescluster/snapshots_test.go @@ -27,7 +27,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestReconcileVolumeSnapshots(t *testing.T) { diff --git a/internal/controller/postgrescluster/util.go b/internal/controller/postgrescluster/util.go index 0cb7dd673f..e66261a608 100644 --- a/internal/controller/postgrescluster/util.go +++ b/internal/controller/postgrescluster/util.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/controller/postgrescluster/util_test.go b/internal/controller/postgrescluster/util_test.go index a45fe30946..9955dae644 100644 --- a/internal/controller/postgrescluster/util_test.go +++ b/internal/controller/postgrescluster/util_test.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestSafeHash32(t *testing.T) { diff --git a/internal/controller/postgrescluster/volumes.go b/internal/controller/postgrescluster/volumes.go index 6a8d6acc99..3e6919ee15 100644 --- a/internal/controller/postgrescluster/volumes.go +++ b/internal/controller/postgrescluster/volumes.go @@ -25,7 +25,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 a7a68196c5..06acdac8da 100644 --- a/internal/controller/postgrescluster/volumes_test.go +++ b/internal/controller/postgrescluster/volumes_test.go @@ -25,7 +25,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestHandlePersistentVolumeClaimError(t *testing.T) { diff --git a/internal/controller/runtime/runtime.go b/internal/controller/runtime/runtime.go index 5175806702..f7879c679f 100644 --- a/internal/controller/runtime/runtime.go +++ b/internal/controller/runtime/runtime.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager/signals" "github.com/percona/percona-postgresql-operator/v3/internal/logging" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type ( diff --git a/internal/controller/standalone_pgadmin/configmap.go b/internal/controller/standalone_pgadmin/configmap.go index 9410fd6692..073e39ff03 100644 --- a/internal/controller/standalone_pgadmin/configmap.go +++ b/internal/controller/standalone_pgadmin/configmap.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 df621e19cb..b54979c4d4 100644 --- a/internal/controller/standalone_pgadmin/configmap_test.go +++ b/internal/controller/standalone_pgadmin/configmap_test.go @@ -11,7 +11,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 b54edb832a..e249201f6c 100644 --- a/internal/controller/standalone_pgadmin/controller.go +++ b/internal/controller/standalone_pgadmin/controller.go @@ -19,7 +19,7 @@ import ( 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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // PGAdminReconciler reconciles a PGAdmin object @@ -34,7 +34,7 @@ type PGAdminReconciler struct { IsOpenShift bool } -//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="postgresclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="pgadmins",verbs={get} -//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins/status",verbs={patch} +//+kubebuilder:rbac:groups="upstream.pgv2.percona.com",resources="pgadmins",verbs={get} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="pgadmins/finalizers",verbs={update} +// +kubebuilder:rbac:groups="upstream.pgv2.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 e52f751444..37d20dad35 100644 --- a/internal/controller/standalone_pgadmin/controller_test.go +++ b/internal/controller/standalone_pgadmin/controller_test.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestDeleteControlled(t *testing.T) { diff --git a/internal/controller/standalone_pgadmin/helpers_unit_test.go b/internal/controller/standalone_pgadmin/helpers_unit_test.go index fc01cb0c7a..67472a0d8f 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 7425d7c264..8a111a6168 100644 --- a/internal/controller/standalone_pgadmin/pod.go +++ b/internal/controller/standalone_pgadmin/pod.go @@ -15,7 +15,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/controller/standalone_pgadmin/pod_test.go b/internal/controller/standalone_pgadmin/pod_test.go index 652109c0e4..e8b6655a50 100644 --- a/internal/controller/standalone_pgadmin/pod_test.go +++ b/internal/controller/standalone_pgadmin/pod_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 b4b363b1b9..6b8cbc8d5d 100644 --- a/internal/controller/standalone_pgadmin/postgrescluster.go +++ b/internal/controller/standalone_pgadmin/postgrescluster.go @@ -12,10 +12,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/percona/percona-postgresql-operator/v3/internal/naming" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) -//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv2.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.pgv3.percona.com",resources="postgresclusters",verbs={list,watch} +//+kubebuilder:rbac:groups="upstream.pgv2.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 e32a4d86fb..58096006ee 100644 --- a/internal/controller/standalone_pgadmin/service.go +++ b/internal/controller/standalone_pgadmin/service.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 fbf7047cb2..039255c6a6 100644 --- a/internal/controller/standalone_pgadmin/service_test.go +++ b/internal/controller/standalone_pgadmin/service_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 99bfc90f27..34f7abdfb8 100644 --- a/internal/controller/standalone_pgadmin/statefulset.go +++ b/internal/controller/standalone_pgadmin/statefulset.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 229da1bda3..ab01adb38f 100644 --- a/internal/controller/standalone_pgadmin/statefulset_test.go +++ b/internal/controller/standalone_pgadmin/statefulset_test.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 b3cf2291c0..d24045bcae 100644 --- a/internal/controller/standalone_pgadmin/users.go +++ b/internal/controller/standalone_pgadmin/users.go @@ -20,7 +20,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 f907605ac0..fa775f867c 100644 --- a/internal/controller/standalone_pgadmin/users_test.go +++ b/internal/controller/standalone_pgadmin/users_test.go @@ -23,7 +23,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 6709eb3257..0063f4e8d8 100644 --- a/internal/controller/standalone_pgadmin/volume.go +++ b/internal/controller/standalone_pgadmin/volume.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "github.com/percona/percona-postgresql-operator/v3/internal/naming" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 60d69f914d..7938ccbe3f 100644 --- a/internal/controller/standalone_pgadmin/volume_test.go +++ b/internal/controller/standalone_pgadmin/volume_test.go @@ -22,7 +22,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 1b178786fb..5db21eb6f8 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // watchPostgresClusters returns a [handler.EventHandler] for PostgresClusters. @@ -73,7 +73,7 @@ func (r *PGAdminReconciler) watchForRelatedSecret() handler.EventHandler { } } -//+kubebuilder:rbac:groups="upstream.pgv3.percona.com",resources="pgadmins",verbs={list} +//+kubebuilder:rbac:groups="upstream.pgv2.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 0a962ee7f3..0b1d61b7a8 100644 --- a/internal/controller/standalone_pgadmin/watches_test.go +++ b/internal/controller/standalone_pgadmin/watches_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestFindPGAdminsForSecret(t *testing.T) { diff --git a/internal/naming/labels.go b/internal/naming/labels.go index 5b95870fc9..ad67a6bc9c 100644 --- a/internal/naming/labels.go +++ b/internal/naming/labels.go @@ -11,7 +11,7 @@ import ( const ( labelPrefix = "postgres-operator.crunchydata.com/" - perconaLabelPrefix = "pgv3.percona.com/" + perconaLabelPrefix = "pgv2.percona.com/" appK8sPrefix = "app.kubernetes.io/" LabelVersion = perconaLabelPrefix + "version" diff --git a/internal/naming/names.go b/internal/naming/names.go index b8a698d13a..6aba325682 100644 --- a/internal/naming/names.go +++ b/internal/naming/names.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/percona/percona-postgresql-operator/v3/internal/config" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/naming/names_test.go b/internal/naming/names_test.go index 746aed2db9..8e2f798651 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestAsObjectKey(t *testing.T) { diff --git a/internal/naming/selectors.go b/internal/naming/selectors.go index 334fcc7f92..b3089967f2 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 8757d48108..16a7875703 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestAnyCluster(t *testing.T) { diff --git a/internal/patroni/config.go b/internal/patroni/config.go index 1315c2479e..5cc177cdba 100644 --- a/internal/patroni/config.go +++ b/internal/patroni/config.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/patroni/config_test.go b/internal/patroni/config_test.go index 9ac89ce380..9ee3aac7a8 100644 --- a/internal/patroni/config_test.go +++ b/internal/patroni/config_test.go @@ -24,7 +24,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true bootstrap: initdb: - data-checksums diff --git a/internal/patroni/rbac.go b/internal/patroni/rbac.go index 9918a230bb..8856ffc65d 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 7c300281ac..53dcb1227a 100644 --- a/internal/patroni/rbac_test.go +++ b/internal/patroni/rbac_test.go @@ -11,7 +11,7 @@ import ( "gotest.tools/v3/assert" "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func isUniqueAndSorted(slice []string) bool { diff --git a/internal/patroni/reconcile.go b/internal/patroni/reconcile.go index 4ee7d2f35f..538698d2ce 100644 --- a/internal/patroni/reconcile.go +++ b/internal/patroni/reconcile.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 b85afec178..29b9d53523 100644 --- a/internal/patroni/reconcile_test.go +++ b/internal/patroni/reconcile_test.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestClusterConfigMap(t *testing.T) { @@ -267,12 +267,12 @@ volumes: name: crunchy-bin `, labels: map[string]string{ - "pgv3.percona.com/version": "2.7.0", + "pgv2.percona.com/version": "2.7.0", }, }, "version <2.7.0 specified": { labels: map[string]string{ - "pgv3.percona.com/version": "2.6.0", + "pgv2.percona.com/version": "2.6.0", }, expectedSpec: ` containers: diff --git a/internal/pgadmin/config.go b/internal/pgadmin/config.go index 8b851a610b..521828d232 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/pgadmin/config_test.go b/internal/pgadmin/config_test.go index 313916a3e6..748609e997 100644 --- a/internal/pgadmin/config_test.go +++ b/internal/pgadmin/config_test.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestPodConfigFiles(t *testing.T) { diff --git a/internal/pgadmin/reconcile.go b/internal/pgadmin/reconcile.go index 0817a16d19..fd7e6e2047 100644 --- a/internal/pgadmin/reconcile.go +++ b/internal/pgadmin/reconcile.go @@ -15,7 +15,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 b2b1550fb7..60b680d0b4 100644 --- a/internal/pgadmin/reconcile_test.go +++ b/internal/pgadmin/reconcile_test.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestConfigMap(t *testing.T) { diff --git a/internal/pgadmin/users.go b/internal/pgadmin/users.go index 3a5eeab796..f32d0a080c 100644 --- a/internal/pgadmin/users.go +++ b/internal/pgadmin/users.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type Executor func( diff --git a/internal/pgadmin/users_test.go b/internal/pgadmin/users_test.go index 0fe583b2b8..2315ee7d23 100644 --- a/internal/pgadmin/users_test.go +++ b/internal/pgadmin/users_test.go @@ -18,7 +18,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestWriteUsersInPGAdmin(t *testing.T) { diff --git a/internal/pgbackrest/config.go b/internal/pgbackrest/config.go index 3ba3c4def7..d01e1de9e2 100644 --- a/internal/pgbackrest/config.go +++ b/internal/pgbackrest/config.go @@ -18,7 +18,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/pgbackrest/config_test.go b/internal/pgbackrest/config_test.go index 3d9150bac1..cb8f759ba9 100644 --- a/internal/pgbackrest/config_test.go +++ b/internal/pgbackrest/config_test.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true [global] archive-async = y diff --git a/internal/pgbackrest/pgbackrest.go b/internal/pgbackrest/pgbackrest.go index a4bf92fcc3..b7b4691398 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/pgbackrest/pgbackrest_test.go b/internal/pgbackrest/pgbackrest_test.go index 520a2516a6..5f9922df9e 100644 --- a/internal/pgbackrest/pgbackrest_test.go +++ b/internal/pgbackrest/pgbackrest_test.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "github.com/percona/percona-postgresql-operator/v3/internal/testing/require" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestStanzaCreateOrUpgrade(t *testing.T) { diff --git a/internal/pgbackrest/postgres.go b/internal/pgbackrest/postgres.go index 2f2b736187..e87d865eb2 100644 --- a/internal/pgbackrest/postgres.go +++ b/internal/pgbackrest/postgres.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/percona/percona-postgresql-operator/v3/internal/postgres" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 45c1c0987b..30dd633fb6 100644 --- a/internal/pgbackrest/postgres_test.go +++ b/internal/pgbackrest/postgres_test.go @@ -12,7 +12,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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["pgv3.percona.com/version"] = version.Version() + cluster.Labels["pgv2.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["pgv3.percona.com/version"] = "2.7.0" + cluster.Labels["pgv2.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 08f5a8c902..be33f66bdb 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 fcfb051d25..7004e19cfd 100644 --- a/internal/pgbackrest/rbac_test.go +++ b/internal/pgbackrest/rbac_test.go @@ -11,7 +11,7 @@ import ( "gotest.tools/v3/assert" "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func isUniqueAndSorted(slice []string) bool { diff --git a/internal/pgbackrest/reconcile.go b/internal/pgbackrest/reconcile.go index 576e284954..37ecbd0aed 100644 --- a/internal/pgbackrest/reconcile.go +++ b/internal/pgbackrest/reconcile.go @@ -18,7 +18,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 9f72b639ca..11995230aa 100644 --- a/internal/pgbackrest/reconcile_test.go +++ b/internal/pgbackrest/reconcile_test.go @@ -21,7 +21,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestAddRepoVolumesToPod(t *testing.T) { diff --git a/internal/pgbackrest/util.go b/internal/pgbackrest/util.go index e3aeae9831..ffb6f36be0 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 134754e26f..5c66cf0f5f 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestCalculateConfigHashes(t *testing.T) { diff --git a/internal/pgbouncer/config.go b/internal/pgbouncer/config.go index 4c93a16a7a..cca04a513e 100644 --- a/internal/pgbouncer/config.go +++ b/internal/pgbouncer/config.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/pgbouncer/config_test.go b/internal/pgbouncer/config_test.go index 3348dfb8b2..0468a41eb4 100644 --- a/internal/pgbouncer/config_test.go +++ b/internal/pgbouncer/config_test.go @@ -20,7 +20,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.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 pgv3.percona.com/override-config=true +# If you want to override the config, annotate this ConfigMap with pgv2.percona.com/override-config=true [pgbouncer] %include /etc/pgbouncer/pgbouncer.ini diff --git a/internal/pgbouncer/reconcile.go b/internal/pgbouncer/reconcile.go index ff5cd291af..ae216ec30c 100644 --- a/internal/pgbouncer/reconcile.go +++ b/internal/pgbouncer/reconcile.go @@ -17,7 +17,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // ConfigMap populates the PgBouncer ConfigMap. diff --git a/internal/pgbouncer/reconcile_test.go b/internal/pgbouncer/reconcile_test.go index 2e855e192e..df135c187f 100644 --- a/internal/pgbouncer/reconcile_test.go +++ b/internal/pgbouncer/reconcile_test.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestConfigMap(t *testing.T) { diff --git a/internal/pgmonitor/exporter.go b/internal/pgmonitor/exporter.go index 11754f2c8f..da1a36e109 100644 --- a/internal/pgmonitor/exporter.go +++ b/internal/pgmonitor/exporter.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/percona/percona-postgresql-operator/v3/internal/logging" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/pgmonitor/exporter_test.go b/internal/pgmonitor/exporter_test.go index 16d1220714..e2cb9eda77 100644 --- a/internal/pgmonitor/exporter_test.go +++ b/internal/pgmonitor/exporter_test.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/yaml" "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGenerateDefaultExporterQueries(t *testing.T) { diff --git a/internal/pgmonitor/postgres.go b/internal/pgmonitor/postgres.go index 957568703b..d3708a7c12 100644 --- a/internal/pgmonitor/postgres.go +++ b/internal/pgmonitor/postgres.go @@ -11,7 +11,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/pgmonitor/postgres_test.go b/internal/pgmonitor/postgres_test.go index 7172538eb3..790d1db046 100644 --- a/internal/pgmonitor/postgres_test.go +++ b/internal/pgmonitor/postgres_test.go @@ -11,7 +11,7 @@ import ( "gotest.tools/v3/assert" "github.com/percona/percona-postgresql-operator/v3/internal/postgres" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestPostgreSQLHBA(t *testing.T) { diff --git a/internal/pgmonitor/util.go b/internal/pgmonitor/util.go index cf93fed179..7a233b9224 100644 --- a/internal/pgmonitor/util.go +++ b/internal/pgmonitor/util.go @@ -9,7 +9,7 @@ import ( "os" "github.com/percona/percona-postgresql-operator/v3/internal/logging" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func GetQueriesConfigDir(ctx context.Context) string { diff --git a/internal/pgmonitor/util_test.go b/internal/pgmonitor/util_test.go index 401b500875..27a11aa784 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestExporterEnabled(t *testing.T) { diff --git a/internal/pmm/hba.go b/internal/pmm/hba.go index 5c659510e3..4ed6d86009 100644 --- a/internal/pmm/hba.go +++ b/internal/pmm/hba.go @@ -2,7 +2,7 @@ package pmm import ( "github.com/percona/percona-postgresql-operator/v3/internal/postgres" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/postgres/config.go b/internal/postgres/config.go index e7bfbe75df..8155751378 100644 --- a/internal/postgres/config.go +++ b/internal/postgres/config.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/postgres/config_test.go b/internal/postgres/config_test.go index cba7946653..bf3afce503 100644 --- a/internal/postgres/config_test.go +++ b/internal/postgres/config_test.go @@ -21,7 +21,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestConfigDirectory(t *testing.T) { diff --git a/internal/postgres/huge_pages.go b/internal/postgres/huge_pages.go index 7883267fc1..eba99af8b1 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 ac43be88e8..03b676f728 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestSetHugePages(t *testing.T) { diff --git a/internal/postgres/reconcile.go b/internal/postgres/reconcile.go index fd34c98cb0..b5651c0e9c 100644 --- a/internal/postgres/reconcile.go +++ b/internal/postgres/reconcile.go @@ -14,7 +14,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var ( diff --git a/internal/postgres/reconcile_test.go b/internal/postgres/reconcile_test.go index d3a5ca407c..3b6a2a8231 100644 --- a/internal/postgres/reconcile_test.go +++ b/internal/postgres/reconcile_test.go @@ -16,7 +16,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestDataVolumeMount(t *testing.T) { diff --git a/internal/postgres/users.go b/internal/postgres/users.go index ea951a4d9a..a654f57c05 100644 --- a/internal/postgres/users.go +++ b/internal/postgres/users.go @@ -16,7 +16,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 6738d3258c..36281c022d 100644 --- a/internal/postgres/users_test.go +++ b/internal/postgres/users_test.go @@ -15,7 +15,7 @@ import ( "gotest.tools/v3/assert" "github.com/percona/percona-postgresql-operator/v3/internal/testing/cmp" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestSanitizeAlterRoleOptions(t *testing.T) { diff --git a/internal/postgres/validation.go b/internal/postgres/validation.go index 48b2523144..f1d9fd5181 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 c588c637fe..76fd3fe9c7 100644 --- a/internal/postgres/validation_test.go +++ b/internal/postgres/validation_test.go @@ -13,7 +13,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestSanitizeLogDirectory(t *testing.T) { diff --git a/internal/registration/interface.go b/internal/registration/interface.go index bbd11276bb..1e115abf04 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type Registration interface { diff --git a/internal/registration/runner.go b/internal/registration/runner.go index c71e814429..0757d08b61 100644 --- a/internal/registration/runner.go +++ b/internal/registration/runner.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "github.com/percona/percona-postgresql-operator/v3/internal/logging" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // Runner implements [Registration] by loading and validating the token at a diff --git a/internal/testing/validation/postgrescluster_test.go b/internal/testing/validation/postgrescluster_test.go index 2be556d472..081bf28010 100644 --- a/internal/testing/validation/postgrescluster_test.go +++ b/internal/testing/validation/postgrescluster_test.go @@ -16,7 +16,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestPostgresUserOptions(t *testing.T) { diff --git a/internal/upgradecheck/header.go b/internal/upgradecheck/header.go index 8191d1d245..e9060a252d 100644 --- a/internal/upgradecheck/header.go +++ b/internal/upgradecheck/header.go @@ -23,7 +23,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/internal/upgradecheck/header_test.go b/internal/upgradecheck/header_test.go index 31841bf5e5..25ad181234 100644 --- a/internal/upgradecheck/header_test.go +++ b/internal/upgradecheck/header_test.go @@ -25,7 +25,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGenerateHeader(t *testing.T) { diff --git a/internal/upgradecheck/helpers_test.go b/internal/upgradecheck/helpers_test.go index a4fe4a2949..4d8655732e 100644 --- a/internal/upgradecheck/helpers_test.go +++ b/internal/upgradecheck/helpers_test.go @@ -22,7 +22,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type fakeClientWithError struct { diff --git a/percona/certmanager/certmanager.go b/percona/certmanager/certmanager.go index 4c856fed64..0bde678e05 100644 --- a/percona/certmanager/certmanager.go +++ b/percona/certmanager/certmanager.go @@ -20,7 +20,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "github.com/percona/percona-postgresql-operator/v3/internal/naming" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type Controller interface { diff --git a/percona/certmanager/certmanager_test.go b/percona/certmanager/certmanager_test.go index 94762e0b97..e958e4a5ac 100644 --- a/percona/certmanager/certmanager_test.go +++ b/percona/certmanager/certmanager_test.go @@ -18,7 +18,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/percona/percona-postgresql-operator/v3/internal/naming" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 1be6042e6b..fe226a9bd9 100644 --- a/percona/certmanager/names.go +++ b/percona/certmanager/names.go @@ -6,7 +6,7 @@ package certmanager import ( "github.com/percona/percona-postgresql-operator/v3/internal/naming" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 eadb189d8c..fd1ed6e428 100644 --- a/percona/controller/pgbackup/controller.go +++ b/percona/controller/pgbackup/controller.go @@ -38,8 +38,8 @@ import ( 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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( @@ -94,13 +94,13 @@ func (r *PGBackupReconciler) SetupWithManager(ctx context.Context, mgr manager.M return b.Complete(r) } -// +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=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=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 765b0e24c4..c1e2c74a3d 100644 --- a/percona/controller/pgbackup/controller_test.go +++ b/percona/controller/pgbackup/controller_test.go @@ -18,8 +18,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestFailIfClusterIsNotReady(t *testing.T) { diff --git a/percona/controller/pgbackup/snapshots/offline.go b/percona/controller/pgbackup/snapshots/offline.go index 0994176834..ee70788042 100644 --- a/percona/controller/pgbackup/snapshots/offline.go +++ b/percona/controller/pgbackup/snapshots/offline.go @@ -16,7 +16,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) const ( diff --git a/percona/controller/pgbackup/snapshots/reconcile.go b/percona/controller/pgbackup/snapshots/reconcile.go index 450d448fdc..dffc6514e8 100644 --- a/percona/controller/pgbackup/snapshots/reconcile.go +++ b/percona/controller/pgbackup/snapshots/reconcile.go @@ -22,7 +22,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) const ( diff --git a/percona/controller/pgbackup/snapshots/reconcile_test.go b/percona/controller/pgbackup/snapshots/reconcile_test.go index 4f4459cc4b..777e0ea256 100644 --- a/percona/controller/pgbackup/snapshots/reconcile_test.go +++ b/percona/controller/pgbackup/snapshots/reconcile_test.go @@ -18,7 +18,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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, "pgv3.percona.com/v2", vs.OwnerReferences[0].APIVersion) + assert.Equal(t, "pgv2.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 ca7a59592c..d7fadad447 100644 --- a/percona/controller/pgbackup/testutils_test.go +++ b/percona/controller/pgbackup/testutils_test.go @@ -13,8 +13,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type fakeClient struct { diff --git a/percona/controller/pgcluster/backup.go b/percona/controller/pgcluster/backup.go index e9f3b67e2e..b86852c1b5 100644 --- a/percona/controller/pgcluster/backup.go +++ b/percona/controller/pgcluster/backup.go @@ -21,7 +21,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 21ce1faeec..49da985a4c 100644 --- a/percona/controller/pgcluster/backup_test.go +++ b/percona/controller/pgcluster/backup_test.go @@ -19,8 +19,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestBackupOwnerReference(t *testing.T) { diff --git a/percona/controller/pgcluster/controller.go b/percona/controller/pgcluster/controller.go index f4e3b8720f..240d4880b8 100644 --- a/percona/controller/pgcluster/controller.go +++ b/percona/controller/pgcluster/controller.go @@ -45,8 +45,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( @@ -211,11 +211,11 @@ func (r *PGClusterReconciler) watchSecrets() handler.TypedFuncs[*corev1.Secret, } } -// +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=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=apps,resources=replicasets,verbs=create;delete;get;list;patch;watch -// +kubebuilder:rbac:groups=pgv3.percona.com,resources=perconapgclusters/finalizers,verbs=update +// +kubebuilder:rbac:groups=pgv2.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 5f69a931c5..003fa6d0eb 100644 --- a/percona/controller/pgcluster/controller_test.go +++ b/percona/controller/pgcluster/controller_test.go @@ -27,8 +27,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var _ = Describe("PG Cluster", Ordered, func() { @@ -109,7 +109,7 @@ var _ = Describe("Annotations", Ordered, func() { }) It("should create PerconaPGCluster with annotations", func() { - cr.Annotations["pgv3.percona.com/trigger-switchover"] = "true" + cr.Annotations["pgv2.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 a6a71f950d..3da971263d 100644 --- a/percona/controller/pgcluster/finalizer.go +++ b/percona/controller/pgcluster/finalizer.go @@ -17,7 +17,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) func (r *PGClusterReconciler) deletePVC(ctx context.Context, cr *v2.PerconaPGCluster) error { diff --git a/percona/controller/pgcluster/finalizer_test.go b/percona/controller/pgcluster/finalizer_test.go index 7a2a5d1d04..566fa73b4e 100644 --- a/percona/controller/pgcluster/finalizer_test.go +++ b/percona/controller/pgcluster/finalizer_test.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" 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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var _ = Describe("Finalizers", Ordered, func() { diff --git a/percona/controller/pgcluster/gethost_test.go b/percona/controller/pgcluster/gethost_test.go index 5394a4f68b..fabde53ff4 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/v3/pkg/apis/pgv3.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestGetHost(t *testing.T) { diff --git a/percona/controller/pgcluster/owner_ref_migration.go b/percona/controller/pgcluster/owner_ref_migration.go index ef3381782b..590d9274c5 100644 --- a/percona/controller/pgcluster/owner_ref_migration.go +++ b/percona/controller/pgcluster/owner_ref_migration.go @@ -13,8 +13,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" "github.com/pkg/errors" ) diff --git a/percona/controller/pgcluster/patroniversion.go b/percona/controller/pgcluster/patroniversion.go index afb9954743..2be434299b 100644 --- a/percona/controller/pgcluster/patroniversion.go +++ b/percona/controller/pgcluster/patroniversion.go @@ -24,7 +24,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 a00cd6494d..3666bdf31f 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/v3/pkg/apis/pgv3.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 f2b5fc188a..2e92701974 100644 --- a/percona/controller/pgcluster/patroniversion_test.go +++ b/percona/controller/pgcluster/patroniversion_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/types" pNaming "github.com/percona/percona-postgresql-operator/v3/percona/naming" - v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 fb9e56aa34..ad0c32993d 100644 --- a/percona/controller/pgcluster/pvc.go +++ b/percona/controller/pgcluster/pvc.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) 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 1db891b8a7..b08aeae5a7 100644 --- a/percona/controller/pgcluster/restore.go +++ b/percona/controller/pgcluster/restore.go @@ -8,7 +8,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 5b7b439f5f..d767f05c31 100644 --- a/percona/controller/pgcluster/schedule.go +++ b/percona/controller/pgcluster/schedule.go @@ -16,8 +16,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) 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 f77dc60619..fb8191d60b 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/v3/pkg/apis/pgv3.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 5bd3dbd27d..f68617d440 100644 --- a/percona/controller/pgcluster/standby.go +++ b/percona/controller/pgcluster/standby.go @@ -21,8 +21,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( diff --git a/percona/controller/pgcluster/standby_test.go b/percona/controller/pgcluster/standby_test.go index c7781a2da0..e519987240 100644 --- a/percona/controller/pgcluster/standby_test.go +++ b/percona/controller/pgcluster/standby_test.go @@ -18,8 +18,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestReconcileStandbyLag(t *testing.T) { diff --git a/percona/controller/pgcluster/status.go b/percona/controller/pgcluster/status.go index c253840170..ec5c0bbfab 100644 --- a/percona/controller/pgcluster/status.go +++ b/percona/controller/pgcluster/status.go @@ -15,8 +15,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) 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 e76470da28..8a840287f9 100644 --- a/percona/controller/pgcluster/status_test.go +++ b/percona/controller/pgcluster/status_test.go @@ -21,8 +21,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var _ = Describe("PG Cluster status", Ordered, func() { diff --git a/percona/controller/pgcluster/suite_test.go b/percona/controller/pgcluster/suite_test.go index fedf9ef9f1..33c6c6fe5e 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/v3/pkg/apis/pgv3.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // 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 0f2c7ffb5f..9e637c1f7b 100644 --- a/percona/controller/pgcluster/testutils_test.go +++ b/percona/controller/pgcluster/testutils_test.go @@ -25,8 +25,8 @@ import ( 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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var k8sClient client.Client diff --git a/percona/controller/pgcluster/version.go b/percona/controller/pgcluster/version.go index 81344cf6e1..78b2d9fb08 100644 --- a/percona/controller/pgcluster/version.go +++ b/percona/controller/pgcluster/version.go @@ -15,7 +15,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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 77171519b5..f7dc5652e7 100644 --- a/percona/controller/pgcluster/version_test.go +++ b/percona/controller/pgcluster/version_test.go @@ -25,7 +25,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "github.com/percona/percona-postgresql-operator/v3/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) var _ = Describe("Ensure Version", Ordered, func() { diff --git a/percona/controller/pgrestore/controller.go b/percona/controller/pgrestore/controller.go index 560bd6587a..72a34fd172 100644 --- a/percona/controller/pgrestore/controller.go +++ b/percona/controller/pgrestore/controller.go @@ -22,7 +22,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.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=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=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=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 46fb399f01..55316a0ecd 100644 --- a/percona/controller/pgrestore/snapshot/reconcile.go +++ b/percona/controller/pgrestore/snapshot/reconcile.go @@ -31,8 +31,8 @@ import ( 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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 d383edf9a8..3db4817a3b 100644 --- a/percona/controller/pgrestore/snapshot/reconcile_test.go +++ b/percona/controller/pgrestore/snapshot/reconcile_test.go @@ -25,8 +25,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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 b2a214d528..340353c2bc 100644 --- a/percona/controller/pgrestore/utils/pgbackrest.go +++ b/percona/controller/pgrestore/utils/pgbackrest.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type PGBackRestRestore struct { diff --git a/percona/controller/pgrestore/utils/pgbackrest_test.go b/percona/controller/pgrestore/utils/pgbackrest_test.go index 28c5613eee..33f51bb601 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/v3/pkg/apis/pgv3.percona.com/v2" - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestPGBackRestRestoreStartTolerations(t *testing.T) { diff --git a/percona/controller/pgupgrade/controller.go b/percona/controller/pgupgrade/controller.go index d3af2f68ed..585fd0493a 100644 --- a/percona/controller/pgupgrade/controller.go +++ b/percona/controller/pgupgrade/controller.go @@ -20,8 +20,8 @@ import ( "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" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const ( @@ -39,11 +39,11 @@ func (r *PGUpgradeReconciler) SetupWithManager(mgr manager.Manager) error { return builder.ControllerManagedBy(mgr).For(&pgv3.PerconaPGUpgrade{}).Complete(r) } -// +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=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="postgres-operator.crunchydata.com",resources="pgupgrades",verbs={get,list,watch} var errLegacyUpgradeFinalized = errors.New("legacy upgrade is already finished") diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml index c088530254..4e5579c79a 100644 --- a/percona/controller/testdata/sidecar-resources-cr.yaml +++ b/percona/controller/testdata/sidecar-resources-cr.yaml @@ -1,5 +1,5 @@ -apiVersion: pgv3.percona.com/v2 +apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster metadata: name: cluster1 diff --git a/percona/extensions/containers.go b/percona/extensions/containers.go index 4328b975e1..222c3732b5 100644 --- a/percona/extensions/containers.go +++ b/percona/extensions/containers.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" "github.com/percona/percona-postgresql-operator/v3/percona/naming" - pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) func GetExtensionKey(pgMajor int, name, version string) string { diff --git a/percona/k8s/testutils_test.go b/percona/k8s/testutils_test.go index 25e92b7072..452da56fad 100644 --- a/percona/k8s/testutils_test.go +++ b/percona/k8s/testutils_test.go @@ -15,8 +15,8 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type fakeClient struct { diff --git a/percona/k8s/util.go b/percona/k8s/util.go index 87fa12a988..f94dc9337e 100644 --- a/percona/k8s/util.go +++ b/percona/k8s/util.go @@ -19,7 +19,7 @@ import ( "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" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) const WatchNamespaceEnvVar = "WATCH_NAMESPACE" diff --git a/percona/k8s/util_test.go b/percona/k8s/util_test.go index 6f24eb963c..529a550244 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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) type testGetCluster func() *v1beta1.PostgresCluster diff --git a/percona/naming/prefix.go b/percona/naming/prefix.go index e1b18f99b1..97a4973d0d 100644 --- a/percona/naming/prefix.go +++ b/percona/naming/prefix.go @@ -5,7 +5,7 @@ import "strings" const ( PrefixPercona = "percona.com/" PrefixPerconaInternal = "internal." + PrefixPercona - PrefixPerconaPGV3 = "pgv3.percona.com/" + PrefixPerconaPGV3 = "pgv2.percona.com/" PrefixCrunchy = "postgres-operator.crunchydata.com/" ) diff --git a/percona/pgbackrest/pgbackrest.go b/percona/pgbackrest/pgbackrest.go index 0d3b1bf8e2..93ec71b4f9 100644 --- a/percona/pgbackrest/pgbackrest.go +++ b/percona/pgbackrest/pgbackrest.go @@ -12,7 +12,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) type InfoOutput []InfoStanza diff --git a/percona/pmm/pmm.go b/percona/pmm/pmm.go index 879c8bebb6..b3fd0c87c1 100644 --- a/percona/pmm/pmm.go +++ b/percona/pmm/pmm.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "github.com/percona/percona-postgresql-operator/v3/internal/postgres" - v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) const ( diff --git a/percona/pmm/pmm_test.go b/percona/pmm/pmm_test.go index 83a9e343f5..73d4d88cba 100644 --- a/percona/pmm/pmm_test.go +++ b/percona/pmm/pmm_test.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/percona/percona-postgresql-operator/v3/percona/version" - v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv3.percona.com/v2" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) func TestContainer(t *testing.T) { diff --git a/percona/postgres/common.go b/percona/postgres/common.go index a14b954426..370e42586a 100644 --- a/percona/postgres/common.go +++ b/percona/postgres/common.go @@ -13,7 +13,7 @@ import ( "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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) const ( diff --git a/percona/postgres/common_test.go b/percona/postgres/common_test.go index a63967bc5a..85cfc562d1 100644 --- a/percona/postgres/common_test.go +++ b/percona/postgres/common_test.go @@ -12,7 +12,7 @@ import ( 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" + v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) func TestGetPrimaryPod(t *testing.T) { diff --git a/percona/testutils/client.go b/percona/testutils/client.go index 9d7542299b..0c82ba9f42 100644 --- a/percona/testutils/client.go +++ b/percona/testutils/client.go @@ -5,8 +5,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - 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" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func BuildFakeClient(initObjs ...client.Object) client.Client { diff --git a/percona/version/version.go b/percona/version/version.go index c19fe246ab..bd8903a103 100644 --- a/percona/version/version.go +++ b/percona/version/version.go @@ -16,10 +16,10 @@ import ( "github.com/percona/percona-postgresql-operator/v3/percona/version/service/client/version_service" ) -//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: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:embed version.txt var version string diff --git a/percona/version/version_test.go b/percona/version/version_test.go index 1e95e93bae..1e15e5713c 100644 --- a/percona/version/version_test.go +++ b/percona/version/version_test.go @@ -17,10 +17,10 @@ import ( func TestCRDVersionLabel(t *testing.T) { crdNames := []string{ - "perconapgbackups.pgv3.percona.com", - "perconapgclusters.pgv3.percona.com", - "perconapgrestores.pgv3.percona.com", - "perconapgupgrades.pgv3.percona.com", + "perconapgbackups.pgv2.percona.com", + "perconapgclusters.pgv2.percona.com", + "perconapgrestores.pgv2.percona.com", + "perconapgupgrades.pgv2.percona.com", } _, filename, _, ok := runtime.Caller(0) diff --git a/percona/watcher/wal.go b/percona/watcher/wal.go index d44e429699..27184be74b 100644 --- a/percona/watcher/wal.go +++ b/percona/watcher/wal.go @@ -17,7 +17,7 @@ import ( "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" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) const ( diff --git a/percona/watcher/wal_test.go b/percona/watcher/wal_test.go index a54b7181bc..28d0a22fce 100644 --- a/percona/watcher/wal_test.go +++ b/percona/watcher/wal_test.go @@ -13,7 +13,7 @@ import ( "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" + pgv3 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" ) func mustParseTime(layout string, value string) time.Time { //nolint:unparam diff --git a/pkg/apis/pgv3.percona.com/v2/groupversion_info.go b/pkg/apis/pgv2.percona.com/v2/groupversion_info.go similarity index 84% rename from pkg/apis/pgv3.percona.com/v2/groupversion_info.go rename to pkg/apis/pgv2.percona.com/v2/groupversion_info.go index cfed8a5f8b..7fe15f60e6 100644 --- a/pkg/apis/pgv3.percona.com/v2/groupversion_info.go +++ b/pkg/apis/pgv2.percona.com/v2/groupversion_info.go @@ -1,5 +1,5 @@ // +kubebuilder:object:generate=true -// +groupName=pgv3.percona.com +// +groupName=pgv2.percona.com package v2 import ( @@ -9,7 +9,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "pgv3.percona.com", Version: "v2"} + GroupVersion = schema.GroupVersion{Group: "pgv2.percona.com", Version: "v2"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} //nolint:staticcheck diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgbackup_types.go similarity index 99% rename from pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go rename to pkg/apis/pgv2.percona.com/v2/perconapgbackup_types.go index 6bbf9da722..f29ba8f712 100644 --- a/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types.go +++ b/pkg/apis/pgv2.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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func init() { diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgbackup_types_test.go b/pkg/apis/pgv2.percona.com/v2/perconapgbackup_types_test.go similarity index 100% rename from pkg/apis/pgv3.percona.com/v2/perconapgbackup_types_test.go rename to pkg/apis/pgv2.percona.com/v2/perconapgbackup_types_test.go diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go similarity index 99% rename from pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go rename to pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go index c72e71c2cf..7936042267 100644 --- a/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go @@ -21,7 +21,7 @@ import ( "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" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) var allowedWALLevels = []string{"logical", "replica"} @@ -1329,7 +1329,7 @@ type PerconaPGClusterList struct { Items []PerconaPGCluster `json:"items"` } -const labelPrefix = "pgv3.percona.com/" +const labelPrefix = "pgv2.percona.com/" const ( LabelOperatorVersion = labelPrefix + "version" diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types_test.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types_test.go similarity index 99% rename from pkg/apis/pgv3.percona.com/v2/perconapgcluster_types_test.go rename to pkg/apis/pgv2.percona.com/v2/perconapgcluster_types_test.go index d916bad70c..23cc6dce83 100644 --- a/pkg/apis/pgv3.percona.com/v2/perconapgcluster_types_test.go +++ b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types_test.go @@ -16,7 +16,7 @@ import ( "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" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func TestPerconaPGCluster_Default(t *testing.T) { diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgrestore_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgrestore_types.go similarity index 100% rename from pkg/apis/pgv3.percona.com/v2/perconapgrestore_types.go rename to pkg/apis/pgv2.percona.com/v2/perconapgrestore_types.go diff --git a/pkg/apis/pgv3.percona.com/v2/perconapgupgrade_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgupgrade_types.go similarity index 97% rename from pkg/apis/pgv3.percona.com/v2/perconapgupgrade_types.go rename to pkg/apis/pgv2.percona.com/v2/perconapgupgrade_types.go index 05ea0accf5..a74c2b844a 100644 --- a/pkg/apis/pgv3.percona.com/v2/perconapgupgrade_types.go +++ b/pkg/apis/pgv2.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/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + crunchyv1beta1 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) func init() { @@ -113,4 +113,4 @@ type PerconaPGUpgradeStatus struct { crunchyv1beta1.PGUpgradeStatus `json:",inline"` } -const AnnotationAllowUpgrade = "pgv3.percona.com/allow-upgrade" +const AnnotationAllowUpgrade = "pgv2.percona.com/allow-upgrade" diff --git a/pkg/apis/pgv3.percona.com/v2/zz_generated.deepcopy.go b/pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/pgv3.percona.com/v2/zz_generated.deepcopy.go rename to pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go index 9b865582ab..f7c6714833 100644 --- a/pkg/apis/pgv3.percona.com/v2/zz_generated.deepcopy.go +++ b/pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go @@ -9,7 +9,7 @@ package v2 import ( - "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv3.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.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.pgv3.percona.com/v1beta1/crunchy_bridgecluster_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/crunchy_bridgecluster_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/crunchy_bridgecluster_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/crunchy_bridgecluster_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/groupversion_info.go similarity index 87% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/groupversion_info.go index a214ef0679..c55078c4d3 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/groupversion_info.go +++ b/pkg/apis/upstream.pgv2.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.pgv3.percona.com +// +groupName=upstream.pgv2.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.pgv3.percona.com", Version: "v1beta1"} + GroupVersion = schema.GroupVersion{Group: "upstream.pgv2.percona.com", Version: "v1beta1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} //nolint:staticcheck diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/patroni_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/patroni_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/patroni_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/patroni_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgadmin_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgadmin_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/pgadmin_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/pgadmin_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types_test.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types_test.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbackrest_types_test.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbackrest_types_test.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbouncer_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbouncer_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/pgbouncer_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/pgbouncer_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgmonitor_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgmonitor_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/pgmonitor_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/pgmonitor_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/pgupgrade_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/pgupgrade_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/pgupgrade_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/pgupgrade_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgres_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgres_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/postgres_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/postgres_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_test.go similarity index 98% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_test.go index 31a4988edf..e8c6bd1cd3 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_test.go +++ b/pkg/apis/upstream.pgv2.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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.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.pgv3.percona.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: {} spec: diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go similarity index 99% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go index ace77f79a0..b01f4a85b4 100644 --- a/pkg/apis/upstream.pgv3.percona.com/v1beta1/postgrescluster_types.go +++ b/pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go @@ -912,7 +912,7 @@ func NewPostgresCluster() *PostgresCluster { return cluster } -const LabelVersion = "pgv3.percona.com/version" +const LabelVersion = "pgv2.percona.com/version" func (cr *PostgresCluster) CompareVersion(ver string) int { crVersion, err := gover.NewVersion(cr.Labels[LabelVersion]) diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types_test.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types_test.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/shared_types_test.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/shared_types_test.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/standalone_pgadmin_types.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/standalone_pgadmin_types.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/standalone_pgadmin_types.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/standalone_pgadmin_types.go diff --git a/pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go b/pkg/apis/upstream.pgv2.percona.com/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/upstream.pgv3.percona.com/v1beta1/zz_generated.deepcopy.go rename to pkg/apis/upstream.pgv2.percona.com/v1beta1/zz_generated.deepcopy.go From ad805d2577cd537df7904023c5dabaf2fe4c6558 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Mon, 20 Jul 2026 18:02:49 +0500 Subject: [PATCH 32/38] revert local changes mistakenly committed --- build/postgres-operator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile index 110df8036c..b4685dcf28 100644 --- a/build/postgres-operator/Dockerfile +++ b/build/postgres-operator/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubi9 +ARG BASE_IMAGE=ubi10 FROM --platform=${BUILDPLATFORM} golang:1.26 AS go_builder WORKDIR /go/src/github.com/percona/percona-postgresql-operator From dfc12b47eac0f66f403cb1137766cfb4446467e2 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Mon, 20 Jul 2026 18:23:24 +0500 Subject: [PATCH 33/38] fix build failure --- internal/controller/postgrescluster/watches.go | 2 +- pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/controller/postgrescluster/watches.go b/internal/controller/postgrescluster/watches.go index c067396d68..09aa46dca2 100644 --- a/internal/controller/postgrescluster/watches.go +++ b/internal/controller/postgrescluster/watches.go @@ -16,7 +16,7 @@ import ( "github.com/percona/percona-postgresql-operator/v3/internal/naming" "github.com/percona/percona-postgresql-operator/v3/internal/patroni" - "github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1" + "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) // watchCertManagerSecrets returns a handler.EventHandler for cert-manager-issued diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go index 447a3d05ed..cb5c08f574 100644 --- a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go +++ b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go @@ -645,7 +645,7 @@ type Patroni struct { // Backups struct. // +kubebuilder:validation:XValidation:rule="(has(self.enabled) && self.enabled == false) || (has(self.pgbackrest.repos) && size(self.pgbackrest.repos) > 0)",message="At least one repository must be configured when backups are enabled" -type Backups struct {//nolint:recvcheck +type Backups struct { //nolint:recvcheck // Enabled controls whether backups are enabled for the cluster. // Defaulted to true by the operator for crVersion >= 3.1.0. // +optional From 2d44e6258328bc01edc6bd8c6b920a13d0f2aee7 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Mon, 20 Jul 2026 19:58:17 +0500 Subject: [PATCH 34/38] revert mistakenly commited dockerfile changes --- build/postgres-operator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile index b4685dcf28..5ebc1d4f57 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 || true +RUN microdnf update -y && microdnf clean all -y LABEL name="Percona Postgres Operator" \ vendor="Percona" \ From d02592c38cffac74fd0f8c5a96caa68b629bdaac Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 22 Jul 2026 14:37:54 +0500 Subject: [PATCH 35/38] revert Dockerfile --- build/postgres-operator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile index 5ebc1d4f57..b4685dcf28 100644 --- a/build/postgres-operator/Dockerfile +++ b/build/postgres-operator/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubi9 +ARG BASE_IMAGE=ubi10 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" \ From 35ab529bec86a0eb0b83dc4832741cd2f3efef79 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Fri, 24 Jul 2026 16:03:34 +0500 Subject: [PATCH 36/38] fix merge conflict --- cmd/postgres-operator/main.go | 1 - percona/controller/pgbackup/controller_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/postgres-operator/main.go b/cmd/postgres-operator/main.go index 216ffd5eca..5534b5f1e6 100644 --- a/cmd/postgres-operator/main.go +++ b/cmd/postgres-operator/main.go @@ -523,7 +523,6 @@ func getLogLevel() zapcore.LevelEnabler { } } - type envConfig struct { LeaderElection bool `default:"true" envconfig:"PGO_CONTROLLER_LEADER_ELECTION_ENABLED"` LeaderElectionID string `envconfig:"PGO_CONTROLLER_LEASE_NAME"` diff --git a/percona/controller/pgbackup/controller_test.go b/percona/controller/pgbackup/controller_test.go index d43b7747cb..e6dec6e0e5 100644 --- a/percona/controller/pgbackup/controller_test.go +++ b/percona/controller/pgbackup/controller_test.go @@ -18,7 +18,7 @@ import ( "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/v2/percona/pgbackrest" + "github.com/percona/percona-postgresql-operator/v3/percona/pgbackrest" v2 "github.com/percona/percona-postgresql-operator/v3/pkg/apis/pgv2.percona.com/v2" "github.com/percona/percona-postgresql-operator/v3/pkg/apis/upstream.pgv2.percona.com/v1beta1" ) From 5841f62f4ca1c65cadc6bfcaa0c719105da5ef5c Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Fri, 24 Jul 2026 16:07:41 +0500 Subject: [PATCH 37/38] revert Dockerfile --- build/postgres-operator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/postgres-operator/Dockerfile b/build/postgres-operator/Dockerfile index b4685dcf28..45c38b9745 100644 --- a/build/postgres-operator/Dockerfile +++ b/build/postgres-operator/Dockerfile @@ -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 || true +RUN microdnf update -y && microdnf clean all -y LABEL name="Percona Postgres Operator" \ vendor="Percona" \ From 0e21271655c8b7fdca5bb466becbef9d1ee1673c Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Mon, 27 Jul 2026 15:06:08 +0500 Subject: [PATCH 38/38] adapt latest main --- cmd/postgres-operator/main_test.go | 2 +- internal/controller/postgrescluster/instance_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/postgres-operator/main_test.go b/cmd/postgres-operator/main_test.go index 690b3db2a8..017582506e 100644 --- a/cmd/postgres-operator/main_test.go +++ b/cmd/postgres-operator/main_test.go @@ -12,7 +12,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime" + "github.com/percona/percona-postgresql-operator/v3/internal/controller/runtime" ) func TestInitManager(t *testing.T) { diff --git a/internal/controller/postgrescluster/instance_test.go b/internal/controller/postgrescluster/instance_test.go index 7137c4a27e..05d59f8ba3 100644 --- a/internal/controller/postgrescluster/instance_test.go +++ b/internal/controller/postgrescluster/instance_test.go @@ -37,7 +37,7 @@ import ( "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/v2/internal/pki" + "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/events" "github.com/percona/percona-postgresql-operator/v3/internal/testing/require"