K8SPG-1007: Rename upstream CRDs

Makefile

@@ -279,7 +279,7 @@ generate: generate-cw
 generate-crunchy-crd: ## Generate crd
 	GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \
 		crd:crdVersions='v1' \
-		paths='./pkg/apis/postgres-operator.crunchydata.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 \
@@ -297,10 +297,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/postgres-operator.crunchydata.com_postgresclusters.yaml
-	$(KUSTOMIZE) build ./build/crd/pgupgrades > ./config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml
-	$(KUSTOMIZE) build ./build/crd/pgadmins > ./config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml
-	$(KUSTOMIZE) build ./build/crd/crunchybridgeclusters > ./config/crd/bases/postgres-operator.crunchydata.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

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.postgres-operator.crunchydata.com
+  name: postgresclusters.upstream.pgv2.percona.com
 spec:
-  group: postgres-operator.crunchydata.com
+  group: upstream.pgv2.percona.com
   names:
     kind: PostgresCluster
     listKind: PostgresClusterList

build/crd/crunchy/kustomization.yaml

@@ -2,32 +2,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- generated/postgres-operator.crunchydata.com_postgresclusters.yaml
+- generated/upstream.pgv2.percona.com_postgresclusters.yaml
 
 patchesJson6902:
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   path: condition.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   path: todos.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   path: validation.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   patch: |-
     - op: add
       path: "/metadata/labels"

build/crd/crunchybridgeclusters/kustomization.yaml

@@ -2,14 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- generated/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml
+- generated/upstream.pgv2.percona.com_crunchybridgeclusters.yaml
 
 patches:
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: crunchybridgeclusters.postgres-operator.crunchydata.com
+    name: crunchybridgeclusters.upstream.pgv2.percona.com
 # The version below should match the version on the PostgresCluster CRD
   patch: |-
     - op: add

build/crd/pgadmins/kustomization.yaml

@@ -2,20 +2,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- generated/postgres-operator.crunchydata.com_pgadmins.yaml
+- generated/upstream.pgv2.percona.com_pgadmins.yaml
 
 patches:
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: pgadmins.postgres-operator.crunchydata.com
+    name: pgadmins.upstream.pgv2.percona.com
   path: todos.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: pgadmins.postgres-operator.crunchydata.com
+    name: pgadmins.upstream.pgv2.percona.com
 # The version below should match the version on the PostgresCluster CRD
   patch: |-
     - op: add

build/crd/pgupgrades/kustomization.yaml

@@ -2,20 +2,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- generated/postgres-operator.crunchydata.com_pgupgrades.yaml
+- generated/upstream.pgv2.percona.com_pgupgrades.yaml
 
 patches:
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: pgupgrades.postgres-operator.crunchydata.com
+    name: pgupgrades.upstream.pgv2.percona.com
   path: todos.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: pgupgrades.postgres-operator.crunchydata.com
+    name: pgupgrades.upstream.pgv2.percona.com
 # The version below should match the version on the PostgresCluster CRD
   patch: |-
     - op: add

build/crd/postgresclusters/kustomization.yaml

@@ -2,32 +2,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- generated/postgres-operator.crunchydata.com_postgresclusters.yaml
+- generated/upstream.pgv2.percona.com_postgresclusters.yaml
 
 patchesJson6902:
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   path: condition.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   path: todos.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   path: validation.yaml
 - target:
     group: apiextensions.k8s.io
     version: v1
     kind: CustomResourceDefinition
-    name: postgresclusters.postgres-operator.crunchydata.com
+    name: postgresclusters.upstream.pgv2.percona.com
   patch: |-
     - op: add
       path: "/metadata/labels"

build/crd/postgresclusters/kustomization.yamlr

@@ -0,0 +1,36 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- generated/upstream.pgv2.percona.com_postgresclusters.yaml
+
+patchesJson6902:
+- target:
+    group: apiextensions.k8s.io
+    version: v1
+    kind: CustomResourceDefinition
+    name: postgresclusters.upstream.pgv2.percona.com
+  path: condition.yaml
+- target:
+    group: apiextensions.k8s.io
+    version: v1
+    kind: CustomResourceDefinition
+    name: postgresclusters.upstream.pgv2.percona.com
+  path: todos.yaml
+- target:
+    group: apiextensions.k8s.io
+    version: v1
+    kind: CustomResourceDefinition
+    name: postgresclusters.upstream.pgv2.percona.com
+  path: validation.yaml
+- target:
+    group: apiextensions.k8s.io
+    version: v1
+    kind: CustomResourceDefinition
+    name: postgresclusters.upstream.pgv2.percona.com
+  patch: |-
+    - op: add
+      path: "/metadata/labels"
+      value:
+        app.kubernetes.io/name: pgo
+        app.kubernetes.io/version: latest

cmd/postgres-operator/main.go

@@ -40,6 +40,7 @@ import (
 	"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/migration"
 	"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"
@@ -48,7 +49,7 @@ import (
 	perconaRuntime "github.com/percona/percona-postgresql-operator/v2/percona/runtime"
 	"github.com/percona/percona-postgresql-operator/v2/percona/utils/registry"
 	v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2"
-	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
+	"github.com/percona/percona-postgresql-operator/v2/pkg/apis/upstream.pgv2.percona.com/v1beta1"
 )
 
 var (
@@ -279,6 +280,11 @@ func addControllersToManager(ctx context.Context, mgr manager.Manager) error {
 		return errors.Wrap(err, "unable to create PGAdmin controller")
 	}
 
+	migrationReconciler := &migration.Reconciler{Client: mgr.GetClient()}
+	if err := migrationReconciler.SetupWithManager(mgr); err != nil {
+		return errors.Wrap(err, "unable to create legacy PostgresCluster migration controller")
+	}
+
 	return nil
 }
 

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.postgres-operator.crunchydata.com":         1,
-				"PGUpgrade.postgres-operator.crunchydata.com":       1,
-				"PerconaPGBackup.pgv2.percona.com":                  1,
-				"PerconaPGCluster.pgv2.percona.com":                 1,
-				"PerconaPGRestore.pgv2.percona.com":                 1,
-				"PerconaPGUpgrade.pgv2.percona.com":                 1,
-				"PostgresCluster.postgres-operator.crunchydata.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.postgres-operator.crunchydata.com":         1,
-						"PGUpgrade.postgres-operator.crunchydata.com":       1,
-						"PerconaPGBackup.pgv2.percona.com":                  1,
-						"PerconaPGCluster.pgv2.percona.com":                 1,
-						"PerconaPGRestore.pgv2.percona.com":                 1,
-						"PerconaPGUpgrade.pgv2.percona.com":                 1,
-						"PostgresCluster.postgres-operator.crunchydata.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.postgres-operator.crunchydata.com":         19,
-					"PGUpgrade.postgres-operator.crunchydata.com":       19,
-					"PerconaPGBackup.pgv2.percona.com":                  19,
-					"PerconaPGCluster.pgv2.percona.com":                 19,
-					"PerconaPGRestore.pgv2.percona.com":                 19,
-					"PerconaPGUpgrade.pgv2.percona.com":                 19,
-					"PostgresCluster.postgres-operator.crunchydata.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,
 				})
 		})
 	})