refactor: remove overlay database support (#12)

Author: passcod

.github/workflows/integration.yml

@@ -32,49 +32,35 @@ jobs:
               test-rw-schema
               test-ro-schema
             needs_non_pg_snapshot: false
-            needs_cnpg: false
-
           - name: error_paths
             namespaces: >-
               test-non-pg-data
               test-wrong-bucket
             needs_non_pg_snapshot: true
-            needs_cnpg: false
 
           - name: ttls
             namespaces: >-
               test-min-ttl
             needs_non_pg_snapshot: true
-            needs_cnpg: false
 
           - name: switchover
             namespaces: >-
               test-switchover
             needs_non_pg_snapshot: false
-            needs_cnpg: false
-
-          - name: overlay
-            namespaces: >-
-              test-overlay
-              test-overlay-copy
-            needs_non_pg_snapshot: false
-            needs_cnpg: true
 
           - name: consecutive_failures
             namespaces: >-
               test-consecutive-failures
               test-phase-stuck
               test-subresource-reset
             needs_non_pg_snapshot: true
-            needs_cnpg: false
 
           - name: persistent_schemas
             namespaces: >-
               test-persistent-schemas
               test-ps-conflict
               test-ps-skip-missing
             needs_non_pg_snapshot: false
-            needs_cnpg: false
 
     steps:
       - uses: actions/checkout@v6
@@ -177,27 +163,6 @@ jobs:
           load_image postgres:16-alpine
           load_image alpine:latest
 
-      - name: Pre-pull CNPG images
-        if: matrix.needs_cnpg
-        run: |
-          load_image() {
-            local image="$1"
-            local archive="/tmp/$(echo "$image" | tr '/:' '_').tar"
-            crane pull --platform linux/amd64 "$image" "$archive"
-            kind load image-archive "$archive"
-            rm -f "$archive"
-          }
-
-          load_image ghcr.io/cloudnative-pg/cloudnative-pg:1.25.1
-          load_image ghcr.io/cloudnative-pg/postgresql:17
-
-      - name: Install CNPG operator
-        if: matrix.needs_cnpg
-        run: |
-          kubectl apply --server-side -f https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/release-1.25/releases/cnpg-1.25.1.yaml
-          kubectl wait --for=condition=Available deployment/cnpg-controller-manager -n cnpg-system --timeout=120s
-          echo "CNPG operator is ready"
-
       - name: Deploy MinIO
         run: |
           kubectl apply -f tests/fixtures/minio.yaml
@@ -310,9 +275,6 @@ jobs:
             kubectl get all -n "$ns" 2>/dev/null || true
           done
 
-          echo "=== CNPG Clusters ==="
-          kubectl get clusters.postgresql.cnpg.io -A -o yaml 2>/dev/null || true
-
           echo "=== PostgresPhysicalReplicas ==="
           kubectl get postgresphysicalreplicas -A -o yaml 2>/dev/null || true
 

README.md

@@ -102,11 +102,7 @@ Defines a continuously-refreshed replica of a PostgreSQL database restored from
 | `readOnly` | `bool` | No | `true` | Set the restored database to read-only mode. |
 | `postgresExtraConfig` | `string` | No | — | Extra lines appended to `postgresql.conf` (e.g. `shared_preload_libraries`). |
 | `notifications` | `[]NotificationConfig` | No | `[]` | Notification targets called on restore events. |
-| `overlayDatabase` | `OverlayDatabaseConfig` | No | — | Optional overlay database configuration (persistent database via CNPG). Mutually exclusive with `persistentSchemas`. |
-| `persistentSchemas` | `[]string` | No | — | List of schema names to migrate from the old restore to the new restore on each switchover. Mutually exclusive with `overlayDatabase`. |
-
-Using the `overlayDatabase` requires the CloudNative-PG operator to be installed and configured.
-Installing the CNPG cluster-level catalogs is optional but recommended.
+| `persistentSchemas` | `[]string` | No | — | List of schema names to migrate from the previous restore to the new restore on each switchover. |
 
 The cron expression is parsed using the [cronexpr](https://docs.rs/cronexpr) crate.
 It has two interesting features:
@@ -151,34 +147,6 @@ Additional fields for `target: graphQL`:
 | `mutation` | `string` | Yes | GraphQL mutation string. |
 | `variablesTemplate` | `string` | Yes | Template for the GraphQL variables payload. |
 
-#### OverlayDatabaseConfig
-
-Configures an overlay database backed by a CNPG Cluster that imports schemas from the restored replica.
-Two strategies are available: `fdw` (Foreign Data Wrappers, the default) and `copy` (`pg_dump | psql`).
-The `copy` strategy tolerates PostgreSQL version differences and does not require the restore to stay alive after the copy completes.
-This can be used to persistently write data in other schemas in the overlay without interfacing between two databases.
-
-| Field | Type | Required | Default | Description |
-|-------|------|----------|---------|-------------|
-| `strategy` | `"fdw"` \| `"copy"` | No | `"fdw"` | Strategy for populating the overlay from the restore. `fdw` creates foreign tables (restore must stay alive). `copy` uses `pg_dump \| psql` to copy data (tolerates version differences, restore can be discarded). |
-| `postgresVersion` | `uint32` | No | Resolved from image catalog, or `18` | PostgreSQL major version for the CNPG cluster. |
-| `imageCatalog` | `ImageCatalogRef` | No | ClusterImageCatalog | CNPG image catalog for PG version discovery and image resolution. |
-| `storageSizeOverride` | `Quantity` | No | Auto-sized | Override for the overlay PVC size. Auto-sizing: `5Gi + ceil(snapshotSize / 10)`, ratchets up only. |
-| `storageClass` | `string` | No | — | Storage class for the overlay database PVC. |
-| `resources` | `ResourceRequirements` | No | — | Resource requirements for the overlay database pods. |
-| `affinity` | `Affinity` | No | — | Pod affinity rules for the overlay database. |
-| `tolerations` | `[]Toleration` | No | `[]` | Tolerations for the overlay database pods. |
-| `serviceAnnotations` | `map[string]string` | No | — | Annotations for the overlay database's `-rw` Service. |
-| `importGenerated` | `bool` | No | `false` | Include `GENERATED` column expressions when importing foreign schemas (FDW only). Ignored for `copy` strategy. |
-| `retainRestore` | `bool` | No | `true` | When `false` and strategy is `copy`, delete the restore Deployment and PVC after a successful copy. The restore CR is kept for bookkeeping. Ignored for `fdw` strategy. |
-
-#### ImageCatalogRef
-
-| Field | Type | Required | Default | Description |
-|-------|------|----------|---------|-------------|
-| `name` | `string` | Yes | — | Name of the image catalog resource. |
-| `kind` | `string` | No | `"ClusterImageCatalog"` | Kind of the image catalog (`ClusterImageCatalog` or `ImageCatalog`). |
-
 #### Status
 
 | Field | Type | Description |
@@ -194,10 +162,6 @@ This can be used to persistently write data in other schemas in the overlay with
 | `queuePosition` | `uint32` | Position in the global restore queue. |
 | `notifications` | `[]NotificationStatus` | Status of each configured notification target. |
 | `conditions` | `[]Condition` | Standard Kubernetes conditions. |
-| `overlayClusterName` | `string` | Name of the CNPG Cluster CR for the overlay database. |
-| `overlayRestore` | `string` | Name of the restore whose schemas are currently imported into the overlay. |
-| `overlayStorageSize` | `Quantity` | Current (possibly ratcheted) storage size of the overlay PVC. |
-| `overlayPostgresVersion` | `uint32` | Resolved PG major version used for the overlay cluster. |
 | `schemaMigrationJob` | `string` | Name of the active schema migration Job (set while migration is in progress). |
 | `schemaMigrationPhase` | `string` | Phase of the schema migration (`active`, `complete`, or `failed: <reason>`). |
 | `persistentSchemaDataSize` | `Quantity` | Measured size of persistent schema data from the last successful migration. Used to size the next restore PVC. |

src/bin/operator.rs

@@ -380,10 +380,6 @@ fn build_router(state: ServerState, metrics_registry: prometheus::Registry) -> R
 			"/api/v1/snapshot-results/{namespace}/{replica}",
 			axum::routing::post(post_snapshot_results),
 		)
-		.route(
-			"/api/v1/copy-results/{namespace}/{replica}",
-			axum::routing::post(post_copy_results),
-		)
 		.route(
 			"/api/v1/schema-migration-results/{namespace}/{replica}",
 			axum::routing::post(post_schema_migration_results),
@@ -408,24 +404,6 @@ async fn post_snapshot_results(
 	StatusCode::NO_CONTENT
 }
 
-/// Accept copy-job result POSTed by a job.
-///
-/// Body is plain text: `"success"` on success, or the error output on failure.
-async fn post_copy_results(
-	State(state): State<ServerState>,
-	Path((namespace, replica)): Path<(String, String)>,
-	body: String,
-) -> StatusCode {
-	info!(
-		namespace = namespace,
-		replica = replica,
-		bytes = body.len(),
-		"received copy results callback"
-	);
-	state.ctx.copy_results.store(&namespace, &replica, body);
-	StatusCode::NO_CONTENT
-}
-
 async fn post_schema_migration_results(
 	State(state): State<ServerState>,
 	Path((namespace, replica)): Path<(String, String)>,

src/context.rs

@@ -22,8 +22,6 @@ pub struct Context {
 	pub http_client: reqwest::Client,
 	/// In-memory store for snapshot-list results POSTed by jobs.
 	pub snapshot_results: Arc<CallbackStore>,
-	/// In-memory store for overlay copy results POSTed by jobs.
-	pub copy_results: Arc<CallbackStore>,
 	/// In-memory store for schema migration results POSTed by jobs.
 	pub schema_migration_results: Arc<CallbackStore>,
 	/// Base URL the operator is reachable at from within the cluster,
@@ -55,7 +53,6 @@ impl Context {
 			use_port_forward: Arc::new(AtomicBool::new(use_port_forward)),
 			http_client: reqwest::Client::new(),
 			snapshot_results: Arc::new(CallbackStore::default()),
-			copy_results: Arc::new(CallbackStore::default()),
 			schema_migration_results: Arc::new(CallbackStore::default()),
 			callback_base_url,
 			last_reconcile: Arc::new(AtomicI64::new(Timestamp::now().as_second())),
@@ -82,14 +79,6 @@ impl Context {
 		)
 	}
 
-	/// Build the callback URL for a copy job to POST results to.
-	pub fn copy_callback_url(&self, namespace: &str, replica: &str) -> String {
-		format!(
-			"{}/api/v1/copy-results/{namespace}/{replica}",
-			self.callback_base_url
-		)
-	}
-
 	/// Build the callback URL for a schema migration job to POST results to.
 	pub fn schema_migration_callback_url(&self, namespace: &str, replica: &str) -> String {
 		format!(

src/controllers.rs

@@ -2,7 +2,7 @@ use k8s_openapi::api::core::v1::{EnvVar, EnvVarSource, Pod, SecretKeySelector, S
 use kube::{Api, Client};
 
 pub mod jobs;
-pub mod overlay;
+pub mod postgres;
 pub mod replica;
 pub mod restore;