feat: deploy portal in abax-vwfs, add abaxvwfs database in abax minuba database instance

Pulumi.main.yaml

@@ -26,8 +26,8 @@ config:
   abax-vwfs:abax-client-secret:
     secure: AAABACw7CL2RfU5fi7GA3NnyLx9C32vQb+zggY+Xq2Wy5baH+KhutPkNa5ERghESrchdqh4DFoRX7oGnQglfOA==
   abax-vwfs:host: abax-vwfs.branches.no
-  abax-vwfs:tag: main-195814a
-  abax-vwfs:ui-image: europe-north1-docker.pkg.dev/branches-org-main/branches-org-main/abax-vwfs/ui
+  abax-vwfs:tag: main-c41fdb6
+  abax-vwfs:portal-image: europe-north1-docker.pkg.dev/branches-org-main/branches-org-main/abax-vwfs/portal
   abax-vwfs:vwfs-api-url: https://cons-fleetextapi.vwfs.se/api
   abax-vwfs:vwfs-auth-url: https://idp.cons-common.vwfs.se/
   abax-vwfs:vwfs-client-id: f0004c6d-8801-43ee-b18d-d5d17c907182

resources/kubernetes/components/standard-database.ts

@@ -59,25 +59,25 @@ export interface DatabaseDetails {
    * @default 5432
    */
   port?: pulumi.Input<number>;
-  database: pulumi.Input<string>;
+  databases: pulumi.Input<string>[];
 }
 
 export class StandardDatabase extends pulumi.ComponentResource {
-  readonly databaseName: pulumi.Output<string>;
+  readonly databaseNames: pulumi.Output<string[]>;
   readonly databaseSecretName: pulumi.Output<string>;
   readonly serviceHostname: pulumi.Output<string>;
   readonly databaseDetails: pulumi.Output<DatabaseDetails>;
 
   constructor(
     name: string,
+    databases: string[],
     args: StandardDatabaseArgs = {},
     opts?: pulumi.ComponentResourceOptions,
   ) {
     super('branches:k8s:standard-database', name, {}, opts);
     const {
       team = 'branches',
       username = name,
-      database = name,
       sizeInGb = '10Gi',
       postgresqlVersion = '15',
       numberOfInstances = 1,
@@ -110,9 +110,10 @@ export class StandardDatabase extends pulumi.ComponentResource {
           users: {
             [username]: [],
           },
-          databases: {
-            [database]: username,
-          },
+          databases: databases.reduce<Record<string, string>>((acc, db) => {
+            acc[db] = username;
+            return acc;
+          }, {}),
           // enableConnectionPooler: true,
           allowedSourceRanges: null,
           resources: {
@@ -124,15 +125,15 @@ export class StandardDatabase extends pulumi.ComponentResource {
       { parent: this },
     );
 
-    this.databaseName = pulumi.output(database);
+    this.databaseNames = pulumi.output(databases);
     this.databaseSecretName = pulumi.interpolate`${username}.${dbCluster.metadata.name}.credentials.postgresql.acid.zalan.do`;
     this.serviceHostname = pulumi.interpolate`${dbCluster.metadata.name}.${dbCluster.metadata.namespace}.svc.cluster.local`;
 
     this.databaseDetails = pulumi.output({
       secretName: this.databaseSecretName,
       hostname: this.serviceHostname,
       port: 5432,
-      database: database,
+      databases,
     });
   }
 }

resources/kubernetes/components/standard-deployment.ts

@@ -77,6 +77,11 @@ export interface StandardDeploymentArgs
    */
   databaseDetails?: pulumi.Input<DatabaseDetails>;
 
+  /**
+   * The name of the database that the deployment connects to.
+   */
+  database?: pulumi.Input<string>;
+
   /**
    * Log level
    * @default 'info'
@@ -229,6 +234,7 @@ export class StandardDeployment extends pulumi.ComponentResource {
       args: entrypointArgs = undefined,
       volumeMounts = [],
       securityContext = undefined,
+      database,
     } = args;
 
     const publicPort = ports.find(p => p.name === 'public');
@@ -280,7 +286,9 @@ export class StandardDeployment extends pulumi.ComponentResource {
             details =>
               `postgres://$(POSTGRES_username):$(POSTGRES_password)@${
                 details.hostname
-              }:${details.port ?? 5432}/${details.database}?sslmode=require`,
+              }:${details.port ?? 5432}/${
+                database?.toString() ?? details.databases[0]
+              }?sslmode=require`,
           ),
       });
     }

resources/kubernetes/deployments/abax-minuba.ts

@@ -8,6 +8,7 @@ const config = new pulumi.Config('abax-minuba');
 
 export const abaxMinubaDb = new StandardDatabase(
   'abax-minuba',
+  ['abaxminuba', 'abaxvwfs'],
   {
     username: 'abaxminuba',
     database: 'abaxminuba',

resources/kubernetes/deployments/abax-vwfs.ts

@@ -1,23 +1,34 @@
 import * as pulumi from '@pulumi/pulumi';
 import { StandardDeployment } from '../components/standard-deployment';
 import { provider } from '../provider';
+import { abaxMinubaDb } from './abax-minuba';
 
 const config = new pulumi.Config('abax-vwfs');
 
 export const standardDeployment = new StandardDeployment(
   'abax-vwfs',
   {
-    image: config.require('ui-image'),
+    image: config.require('portal-image'),
     tag: config.require('tag'),
     host: config.require('host'),
     secretEnv: {
+      DB_HOST: config.require('db-host'),
+      DB_PASSWORD: config.requireSecret('db-password'),
+      DB_USER: config.requireSecret('db-user'),
+      DB_PORT: config.require('db-port'),
+      DB_DATABASE: config.require('db-database'),
+      ABAX_CLIENT_ID: config.requireSecret('abax-client-id'),
+      ABAX_CLIENT_SECRET: config.requireSecret('abax-client-secret'),
       VWFS_CLIENT_ID: config.require('vwfs-client-id'),
       VWFS_CLIENT_SECRET: config.requireSecret('vwfs-client-secret'),
       VWFS_AUTH_URL: config.require('vwfs-auth-url'),
       VWFS_API_URL: config.require('vwfs-api-url'),
-      ABAX_CLIENT_ID: config.requireSecret('abax-client-id'),
-      ABAX_CLIENT_SECRET: config.requireSecret('abax-client-secret'),
+      SIGN_SECRET: config.requireSecret('sign-secret'),
+      SELF_URL: config.require('self-url'),
+      LOG_LEVEL: config.require('log-level'),
     },
+    databaseDetails: abaxMinubaDb.databaseDetails,
+    database: 'abaxvwfs',
   },
   { providers: [provider] },
 );

resources/kubernetes/deployments/matrix.ts

@@ -12,6 +12,7 @@ const databaseName = 'matrix';
 
 export const synapseDatabase = new StandardDatabase(
   'matrix-db',
+  ['matrix-synapse'],
   {
     username: databaseUser,
     database: databaseName,