fix: add new config

linz · Nov 2, 2023 · bc5fb3e · bc5fb3e
1 parent adeb6d1
commit bc5fb3e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/infra/charts/argo.workflows.ts b/infra/charts/argo.workflows.ts
@@ -1,6 +1,7 @@
 import { Chart, ChartProps, Duration, Helm } from 'cdk8s';
 import { Construct } from 'constructs';
 
+import { CfnOutputKeys } from '../constants.js';
 import { applyDefaultLabels } from '../util/labels.js';
 
 export interface ArgoWorkflowsProps {
@@ -67,7 +68,7 @@ export class ArgoWorkflows extends Chart {
       archive: true,
       archiveTTL: '180d',
       postgresql: {
-        host: 'argodbaf-argodatabaseaf4be14fa2-p8yjinijwbro.cmpyjhgv78aj.ap-southeast-2.rds.amazonaws.com',
+        host: CfnOutputKeys.ArgoDbEndpoint,
         port: 5432,
         database: 'postgres',
         tableName: 'argo_workflows',

diff --git a/infra/constants.ts b/infra/constants.ts
@@ -8,6 +8,8 @@ export const DbName = 'ArgoDb';
 export const CfnOutputKeys = {
   ClusterEndpoint: 'ClusterEndpoint',
 
+  ArgoDbEndpoint: 'ArgoDbEndpoint',
+
   KarpenterServiceAccountName: 'KarpenterServiceAccountName',
   KarpenterServiceAccountRoleArn: 'KarpenterServiceAccountRoleArn',
   KarpenterDefaultInstanceProfile: 'KarpenterDefaultInstanceProfile',
@@ -17,6 +19,7 @@ export const CfnOutputKeys = {
   ArgoRunnerServiceAccountName: 'ArgoRunnerServiceAccountName',
 
   TempBucketName: 'TempBucketName',
+
 } as const;
 
 /** The list of possible keys */

diff --git a/infra/rds/argo.rds.ts b/infra/rds/argo.rds.ts
@@ -1,8 +1,9 @@
-import { App, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
+import { CfnOutput, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as rds from 'aws-cdk-lib/aws-rds';
+import { Construct } from 'constructs';
 
-import { DbName } from './../constants.js';
+import { CfnOutputKeys, DbName } from './../constants.js';
 
 /*
 TODO:
@@ -16,7 +17,7 @@ Database configuration decisions e.g. replication, scaling.
 export class ArgoRdsStack extends Stack {
   db: rds.DatabaseInstance;
   vpc: ec2.IVpc;
-  constructor(scope: App, id: string, props?: StackProps) {
+  constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
     this.vpc = ec2.Vpc.fromLookup(this, 'Vpc', { tags: { BaseVPC: 'true' } });
     this.db = new rds.DatabaseInstance(this, DbName, {
@@ -27,9 +28,6 @@ export class ArgoRdsStack extends Stack {
       publiclyAccessible: false, // will default to false in a non-public VPC
       allocatedStorage: 10,
       maxAllocatedStorage: 40,
-      // masterUsername: 'admin',
-      // masterUserPassword: cdk.SecretValue.plainText('password'),
-      // password rotation will automatically be 30 days, we may want to override this
       credentials: rds.Credentials.fromGeneratedSecret('argodbuser'), // Cannot use IAM with Argo?
       deletionProtection: false,
       removalPolicy: RemovalPolicy.DESTROY, // setting for nonprod
@@ -38,5 +36,6 @@ export class ArgoRdsStack extends Stack {
       enablePerformanceInsights: false, // default is false, noted in as something we might want
       // Configure CloudWatch options?
     });
+    new CfnOutput(this, CfnOutputKeys.ArgoDbEndpoint, { value: this.db.dbInstanceEndpointAddress });
   }
 }