fix pg db

src/custom-resouces/generate-secret/generate-secret.resource.ts

@@ -37,8 +37,8 @@ class GenerateSecretResource extends CustomResource<typeof generateSecretSpecSch
     const current = decodeSecret(this.#secretResource.data) || {};
 
     const expected = {
-      ...current,
       ...secrets,
+      ...current,
     };
 
     if (!isDeepSubset(current, expected)) {

src/custom-resouces/postgres-database/postgres-database.resource.ts

@@ -95,6 +95,7 @@ class PostgresDatabaseResource extends CustomResource<typeof postgresDatabaseSpe
       port: serverSecretData.data.port,
       user: this.#userName,
       database: this.#dbName,
+      ...databaseSecretData.data,
     };
 
     if (!isDeepSubset(databaseSecretData.data, expectedSecret)) {
@@ -132,7 +133,7 @@ class PostgresDatabaseResource extends CustomResource<typeof postgresDatabaseSpe
       };
     }
 
-    const secretData = postgresDatabaseConnectionSecretSchema.safeParse(decodeSecret(this.#serverSecret.current?.data));
+    const secretData = postgresDatabaseConnectionSecretSchema.safeParse(decodeSecret(this.#databaseSecret.data));
     if (!secretData.success || !secretData.data) {
       return {
         ready: false,

src/index.ts

@@ -79,4 +79,4 @@ const customResourceService = services.get(CustomResourceService);
 customResourceService.register(...customResources);
 
 await customResourceService.install(true);
-// await customResourceService.watch();
+await customResourceService.watch();

src/storage-provider/storage-provider.ts

@@ -35,8 +35,7 @@ class StorageProvider {
     if (pvc.metadata?.annotations?.['volume.kubernetes.io/storage-provisioner'] !== PROVISIONER) {
       return;
     }
-    const target = `./data/${pvc.namespace}/${pvc.name}`;
+    const target = `/data/volumes/${pvc.namespace}/${pvc.name}`;
-    console.log('TARGET: ', target);
     try {
       await mkdir(target, { recursive: true });
     } catch (err) {
@@ -46,8 +45,7 @@ class StorageProvider {
     const pv = resourceService.get<V1PersistentVolume>({
       apiVersion: 'v1',
       kind: 'PersistentVolume',
-      name: pvc.name,
+      name: `${pvc.namespace}-${pvc.name}`,
-      namespace: pvc.namespace,
     });
     await pv.load();
     await pv.patch({