From 5476790902ac917ff9a6fe15da2a056c4934c056 Mon Sep 17 00:00:00 2001 From: Alex Pietrow Date: Tue, 30 Jul 2024 10:06:35 +1000 Subject: [PATCH 1/2] Use API service health check for k8s deployments --- deploy/helm/templates/api-service/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/templates/api-service/deployment.yaml b/deploy/helm/templates/api-service/deployment.yaml index af82ac079..0294c116f 100644 --- a/deploy/helm/templates/api-service/deployment.yaml +++ b/deploy/helm/templates/api-service/deployment.yaml @@ -61,12 +61,12 @@ spec: livenessProbe: initialDelaySeconds: 30 httpGet: - path: /actuator/health + path: /api/status/health port: lowcoder-api readinessProbe: initialDelaySeconds: 30 httpGet: - path: /actuator/health + path: /api/status/health port: lowcoder-api resources: {{- toYaml .Values.resources | nindent 12 }} From 700d860f003e8c8880f5cf6f07c5b748b4984f40 Mon Sep 17 00:00:00 2001 From: James Andariese Date: Wed, 7 Aug 2024 14:49:46 -0500 Subject: [PATCH 2/2] allow deployment when monthdb.auth.existingSecret is not specified --- deploy/helm/templates/api-service/configMap.yaml | 2 +- deploy/helm/templates/api-service/secrets.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/templates/api-service/configMap.yaml b/deploy/helm/templates/api-service/configMap.yaml index f48801bc4..103a78ad0 100644 --- a/deploy/helm/templates/api-service/configMap.yaml +++ b/deploy/helm/templates/api-service/configMap.yaml @@ -2,7 +2,7 @@ {{- $name := include "lowcoder.fullname" . -}} {{- $lowcoderDatabase := first .Values.mongodb.auth.databases -}} {{- $redisSecret := lookup "v1" "Secret" $nameSpace .Values.redis.auth.existingSecret | default dict -}} -{{- $redisPassword := (index $redisSecret.data .Values.redis.auth.existingSecretPasswordKey | default "" | b64dec) -}} +{{- $redisPassword := (index ($redisSecret.data|default dict) .Values.redis.auth.existingSecretPasswordKey | default "" | b64dec) -}} apiVersion: v1 kind: ConfigMap diff --git a/deploy/helm/templates/api-service/secrets.yaml b/deploy/helm/templates/api-service/secrets.yaml index a68705937..b7076a1bd 100644 --- a/deploy/helm/templates/api-service/secrets.yaml +++ b/deploy/helm/templates/api-service/secrets.yaml @@ -3,7 +3,7 @@ {{- $mongoPassword := (and .Values.mongodb.auth.passwords (first .Values.mongodb.auth.passwords)) | default "" -}} {{- $lowcoderDatabase := first .Values.mongodb.auth.databases -}} {{- $mongoSecret := lookup "v1" "Secret" $nameSpace .Values.mongodb.auth.existingSecret | default dict -}} -{{- $mongoSecretPassword := (index $mongoSecret.data "password" | default "" | b64dec) -}} +{{- $mongoSecretPassword := (index ($mongoSecret.data | default dict) "password" | default "" | b64dec) -}} {{- $mongoServicename := .Values.mongodb.service.nameOverride | default "" -}} {{- $externalUrl := .Values.mongodb.service.externalUrl -}}