Build new version of sentry-discord-webhooks

Fortify-Labs · Nov 20, 2020 · f4c7efa · f4c7efa
1 parent 5d583ac
commit f4c7efa
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 21 deletions.
diff --git a/devops/kubernetes/main.ts b/devops/kubernetes/main.ts
@@ -56,6 +56,7 @@ export class Fortify extends Chart {
 				name: "postgres-config",
 			},
 			data: {
+				POSTGRES_USER: "postgres",
 				POSTGRES_HOST: "postgres.postgres",
 				POSTGRES_PORT: "5432",
 				POSTGRES_DATABASE: "postgres",
@@ -86,7 +87,7 @@ export class Fortify extends Chart {
 
 		const vaultConfig = new ConfigMap(this, "vault-config", {
 			data: {
-				VAULT_ADDR: "https://vault.default:8200",
+				VAULT_ADDR: "http://vault.default:8200",
 				VAULT_ENVIRONMENT: `/${ENVIRONMENT}`,
 			},
 		});
@@ -204,6 +205,10 @@ export class Fortify extends Chart {
 				namespace: "fortify",
 				match: `Host(\`${DOMAIN}\`)`,
 			},
+
+			// TODO: Implement probes
+			livenessProbe: null,
+			readinessProbe: null,
 		});
 
 		new WebService(this, "gsi-receiver", {
@@ -239,7 +244,7 @@ export class Fortify extends Chart {
 		new WebService(this, "sentry-discord-webhook", {
 			name: "sentry-discord-webhook",
 			replicas: 1,
-			version: "1.0.0",
+			version: "1.1.0",
 			env: [
 				{ name: "LISTEN_ADDRESS", value: ":8080" },
 				{ name: "WEBHOOK_ENV", value: "prod" },
@@ -264,8 +269,8 @@ export class Fortify extends Chart {
 		new WebService(this, "sentry-discord-dev-webhook", {
 			name: "sentry-discord-dev-webhook",
 			replicas: 1,
-			version: "1.0.0",
-			image: REGISTRY + "sentry-discord-webhook:1.0.0",
+			version: "1.1.0",
+			image: REGISTRY + "sentry-discord-webhook:1.1.0",
 			env: [
 				{ name: "LISTEN_ADDRESS", value: ":8080" },
 				{

diff --git a/devops/kubernetes/src/deployment.ts b/devops/kubernetes/src/deployment.ts
@@ -6,6 +6,7 @@ import {
 	PodDisruptionBudget,
 	Secret,
 	ConfigMap,
+	Probe,
 } from "../imports/k8s";
 
 const { REGISTRY } = process.env;
@@ -34,6 +35,9 @@ export interface FortifyDeploymentOptions {
 
 	readonly minAvailable?: number;
 	readonly maxUnavailable?: number;
+
+	livenessProbe?: Probe | null;
+	readinessProbe?: Probe | null;
 }
 
 export class FortifyDeployment extends Construct {
@@ -44,6 +48,29 @@ export class FortifyDeployment extends Construct {
 	) {
 		super(scope, ns);
 
+		let { livenessProbe, readinessProbe } = options;
+
+		if (livenessProbe === undefined) {
+			livenessProbe = {
+				httpGet: {
+					path: "/live",
+					port: 9000,
+				},
+				initialDelaySeconds: 5,
+				periodSeconds: 10,
+			};
+		}
+		if (readinessProbe === undefined) {
+			readinessProbe = {
+				httpGet: {
+					path: "/ready",
+					port: 9000,
+				},
+				initialDelaySeconds: 5,
+				periodSeconds: 10,
+			};
+		}
+
 		const selectorLabels = {
 			app: Node.of(this).uniqueId,
 		};
@@ -128,22 +155,8 @@ export class FortifyDeployment extends Construct {
 									})),
 								],
 								env,
-								livenessProbe: {
-									httpGet: {
-										path: "/live",
-										port: 9000,
-									},
-									initialDelaySeconds: 5,
-									periodSeconds: 10,
-								},
-								readinessProbe: {
-									httpGet: {
-										path: "/ready",
-										port: 9000,
-									},
-									initialDelaySeconds: 5,
-									periodSeconds: 10,
-								},
+								livenessProbe: livenessProbe || undefined,
+								readinessProbe: readinessProbe || undefined,
 							},
 						],
 					},

diff --git a/services/sentry-discord-webhook/docker-compose.yml b/services/sentry-discord-webhook/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   discord-webhook:
-    image: ghcr.io/fortify-labs/fortify/sentry-discord-webhook:1.0.0
+    image: ghcr.io/fortify-labs/fortify/sentry-discord-webhook:1.1.0
     build: .
 
     ports: