fix: Add PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE parameter

kindredgroup · Feb 7, 2024 · 14ff872 · 14ff872
1 parent 875c2e0
commit 14ff872
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -12,18 +12,21 @@ deploy.lock-manager:
 			--atomic \
 			--timeout 60s \
 			--namespace $$K8S_NAMESPACE \
+			--set CONTAINER_PORT=$$CONTAINER_PORT \
+			--set ENABLE_INGRESS=$$ENABLE_INGRESS \
 			--set EXTERNAL_SECRET_DB_PATH=$$EXTERNAL_SECRET_DB_PATH \
+			--set SECRET_STORE_NAME=$$SECRET_STORE_NAME \
 			--set IMAGE_TAG=$$IMAGE_TAG \
 			--set SERVICE_NAME=$$SERVICE_NAME \
-			--set SERVICE_PORT=$$SERVICE_PORT \
 			--set PG_MIN_POOL_SIZE=$$PG_MIN_POOL_SIZE \
 			--set PGDATABASE=$$PGDATABASE \
 			--set PGHOST=$$PGHOST \
 			--set PGPORT=$$PGPORT \
 			--set PGUSER=$$PGUSER \
 			--set PGPASSWORD=$$PGPASSWORD \
+			--set PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE=$$PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE \
 			--set pod.repository=$$REGISTRY_URL/$$SERVICE_NAME \
-			--set webApp.contextRoot=$$K8S_NAMESPACE.$$WEB_APP_CONTEXT_ROOT"
+			--set webApp.contextRoot=$$K8S_NAMESPACE.$$WEB_APP_CONTEXT_ROOT \
 			$$SERVICE_NAME ./$$CHART_PACKAGE; \
 		rm $$CHART_PACKAGE; \
 		kubectl -n $$K8S_NAMESPACE port-forward service/$$SERVICE_NAME $$SERVICE_PORT:http'

diff --git a/lock-manager/.env.example b/lock-manager/.env.example
@@ -16,6 +16,8 @@ PGDATABASE="pit-lock-manager"
 PG_MIN_POOL_SIZE=10
 RENEW_BY_IN_SEC=60
 
-ENVIRONMENT=dev
 WEB_APP_CONTEXT_ROOT=$SERVICE_NAME
-EXTERNAL_SECRET_DB_PATH=$SERVICE_NAME/db
+EXTERNAL_SECRET_DB_PATH=$SERVICE_NAME/db
+ENABLE_INGRESS=false
+PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE=true
+SECRET_STORE_NAME=$SERVICE_NAME
diff --git a/lock-manager/deployment/helm/templates/dev-secretstore.yaml b/lock-manager/deployment/helm/templates/dev-secretstore.yaml
@@ -1,4 +1,4 @@
-{{- if (eq .Values.ENVIRONMENT "dev")}}
+{{- if (eq (.Values.PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE | toString) "true")}}
 apiVersion: external-secrets.io/v1beta1
 kind: SecretStore
 metadata:

diff --git a/lock-manager/deployment/pit/deploy.sh b/lock-manager/deployment/pit/deploy.sh
@@ -41,6 +41,7 @@ HELM_OVERWRITES="--set CONTAINER_PORT=${CONTAINER_PORT} \
   --set PGPORT=${PGPORT} \
   --set PGUSER=${PGUSER} \
   --set PGPASSWORD=${PGPASSWORD} \
+  --set PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE=${PIT_LOCK_MANAGER_DEPLOY_DEV_SECRET_STORE} \
   --set pod.repository=${REGISTRY_URL}/${SERVICE_NAME}"
 
 if [ "${ENABLE_INGRESS}" != "true" ];