Merge pull request #2 from bryopsida/dotenv-secret

Fix helm test with redis + bull

Author: bryopsida

charts/patchwork/Chart.yaml

@@ -2,9 +2,11 @@ apiVersion: v2
 name: patchwork
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: '0.1.0'
 dependencies:
   - name: redis
     repository: https://groundhog2k.github.io/helm-charts/
     version: 0.6.12
+maintainers:
+  - name: bryopsida

charts/patchwork/templates/_helpers.tpl

@@ -60,3 +60,7 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "patchwork.dotenv-secret-name" -}}
+{{- default (printf "%s-dotenv" .Release.Name) .Values.dotenvSecretName }}
+{{- end }}

charts/patchwork/templates/deployment.yaml

@@ -47,6 +47,14 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: dotenv
+              mountPath: /usr/src/app/.env
+              subPath: .env
+      volumes:
+        - name: dotenv
+          secret:
+            secretName: {{ include "patchwork.dotenv-secret-name" . }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/patchwork/templates/dotenv.yaml

@@ -0,0 +1,12 @@
+{{- if not .Values.dotenvSecretName }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "patchwork.dotenv-secret-name" . }}
+type: Opaque
+stringData:
+  .env: |-
+    PATCHWORK_REDIS_HOST={{ default (printf "%s-redis.%s.svc" .Release.Name .Release.Namespace) .Values.redis.host }}
+    PATCHWORK_REDIS_PORT={{ default "6379" .Values.redis.port | int }}
+
+{{- end }}

charts/patchwork/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: ghcr.io/bryopsida/nestjs-starter
+  repository: ghcr.io/bryopsida/patchwork
   pullPolicy: Always
   tag: 'main'
 

package.json

@@ -12,7 +12,7 @@
     "minikube:start": "minikube start --memory=4192m --disk-size=8g --cpus=2 --addons=[ingress,storage-provisioner,default-storageclass,metrics-server]",
     "minikube:stop": "minikube stop",
     "minikube:delete": "minikube delete",
-    "minikube:copyImage": "minikube image load ghcr.io/bryopsida/patchwork:local",
+    "minikube:copyImage": "minikube image load ghcr.io/bryopsida/patchwork:local --overwrite=true",
     "helm:template": "helm template patchwork ./charts/patchwork/",
     "helm:deploy": "helm upgrade --install patchwork ./charts/patchwork/ --set image.tag=local --set image.pullPolicy=IfNotPresent --debug --wait",
     "helm:test": "helm test patchwork",

src/common/conn-options.service.ts

@@ -1,21 +1,30 @@
-import { Injectable } from '@nestjs/common'
+import { Injectable, Logger } from '@nestjs/common'
 import { RedisOptions, Transport } from '@nestjs/microservices'
 import { MicroserviceHealthIndicatorOptions } from '@nestjs/terminus'
 import { config } from 'dotenv'
 
 // ensure process.env is hydrated
-config()
+config({
+  // items in .env take precedence
+  override: true,
+})
 
 @Injectable()
 export class ConnOptionsService {
+  private readonly logger = new Logger(ConnOptionsService.name)
+
   getRedisOptions(): RedisOptions & MicroserviceHealthIndicatorOptions {
+    const options = {
+      host: process.env.PATCHWORK_REDIS_HOST ?? 'localhost',
+      port: parseInt(process.env.PATCHWORK_REDIS_PORT ?? '6379'),
+      password: process.env.PATCHWORK_REDIS_PASSWORD ?? undefined,
+    }
+    this.logger.log(
+      `Using redis host: ${options.host} on port ${options.port} for connections options, source from process.env.PATCHWORK_REDIS_HOST=${process.env.PATCHWORK_REDIS_HOST}, process.env.PATCHWORK_REDIS_PORT=${process.env.PATCHWORK_REDIS_PORT}`
+    )
     return {
       transport: Transport.REDIS,
-      options: {
-        host: process.env.PATCHWORK_REDIS_HOST ?? 'localhost',
-        port: parseInt(process.env.PATCHWORK_REDIS_PORT ?? '6379'),
-        password: process.env.PATCHWORK_REDIS_PASSWORD ?? undefined,
-      },
+      options,
     }
   }
 }