Use generic-service and generic-prometheus-alerts charts (#26)

helm_deploy/hmpps-template-typescript/Chart.yaml

@@ -1,5 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: hmpps-template-typescript
-version: 0.1.0
+version: 0.2.0
+
+dependencies:
+  - name: generic-service
+    version: 1.0.9
+    repository: https://ministryofjustice.github.io/hmpps-helm-charts
+  - name: generic-prometheus-alerts
+    version: 0.1.2
+    repository: https://ministryofjustice.github.io/hmpps-helm-charts

helm_deploy/hmpps-template-typescript/values.yaml

@@ -0,0 +1,58 @@
+---
+generic-service:
+  nameOverride: hmpps-template-typescript
+
+  replicaCount: 4
+
+  image:
+    repository: quay.io/hmpps/hmpps-template-typescript
+    tag: app_version    # override at deployment time
+    port: 3000
+
+  ingress:
+    enabled: true
+    host: app-hostname.local    # override per environment
+    tlsSecretName: hmpps-template-typescript-cert
+    path: /
+
+  livenessProbe:
+    httpGet:
+      path: /ping
+
+  readinessProbe:
+    httpGet:
+      path: /ping
+
+  # Environment variables to load into the deployment
+  env:
+    NODE_ENV: "production"
+    REDIS_TLS_ENABLED: "true"
+    TOKEN_VERIFICATION_ENABLED: "true"
+
+  # Pre-existing kubernetes secrets to load as environment variables in the deployment.
+  # namespace_secrets:
+  #   [name of kubernetes secret]:
+  #     [name of environment variable as seen by app]: [key of kubernetes secret to load]
+
+  namespace_secrets:
+    hmpps-template-typescript:
+      APPINSIGHTS_INSTRUMENTATIONKEY: "APPINSIGHTS_INSTRUMENTATIONKEY"
+      API_CLIENT_ID: "API_CLIENT_ID"
+      API_CLIENT_SECRET: "API_CLIENT_SECRET"
+      SYSTEM_CLIENT_ID: "SYSTEM_CLIENT_ID"
+      SYSTEM_CLIENT_SECRET: "SYSTEM_CLIENT_SECRET"
+      SESSION_SECRET: "SESSION_SECRET"
+    hmpps-template-typescript-elasticache-redis:
+      REDIS_HOST: "primary_endpoint_address"
+      REDIS_AUTH_TOKEN: "auth_token"
+
+  allowlist:
+    office: "217.33.148.210/32"
+    health-kick: "35.177.252.195/32"
+    mojvpn: "81.134.202.29/32"
+    cloudplatform-live1-1: "35.178.209.113/32"
+    cloudplatform-live1-2: "3.8.51.207/32"
+    cloudplatform-live1-3: "35.177.252.54/32"
+
+generic-prometheus-alerts:
+  targetApplication: hmpps-template-typescript

helm_deploy/values-dev.yaml

@@ -1,22 +1,17 @@
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+---
+# Per environment values which override defaults in hmpps-template-typescript/values.yaml
 
-replicaCount: 2
+generic-service:
+  replicaCount: 2
 
-image:
-  repository: quay.io/hmpps/hmpps-template-typescript
-  tag: latest
-  pullPolicy: IfNotPresent
-  port: 3000
+  ingress:
+    host: hmpps-template-typescript-dev.hmpps.service.justice.gov.uk
 
-ingress:
-  enabled: true
-  enable_whitelist: false
-  host: hmpps-template-typescript-dev.hmpps.service.justice.gov.uk
-  cert_secret: hmpps-template-typescript-cert
-  path: /
+  env:
+    INGRESS_URL: "https://hmpps-template-typescript-dev.hmpps.service.justice.gov.uk"
+    HMPPS_AUTH_URL: "https://sign-in-dev.hmpps.service.justice.gov.uk/auth"
+    TOKEN_VERIFICATION_API_URL: "https://token-verification-api-dev.prison.service.justice.gov.uk"
+
+generic-prometheus-alerts:
+  alertSeverity: digital-prison-service-dev
 
-env:
-  HMPPS_AUTH_URL: https://sign-in-dev.hmpps.service.justice.gov.uk/auth
-  TOKEN_VERIFICATION_API_URL: https://token-verification-api-dev.prison.service.justice.gov.uk
-  TOKEN_VERIFICATION_ENABLED: true