From bb41871087b928ac190bf46e11bd8ed54dbbde33 Mon Sep 17 00:00:00 2001
From: rup-narayan-rajbanshi <rup.rajbanshi@togglecorp.com>
Date: Fri, 14 Feb 2025 14:38:50 +0545
Subject: [PATCH] Fix helm configuration.

---
 docker-compose.yml                | 5 +++++
 helm/templates/config/secret.yaml | 2 ++
 helm/values.yaml                  | 9 +++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e84ab51..2f9244f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,11 @@ x-server: &base_server_setup
       GFD_CREDENTIAL: ${GFD_CREDENTIAL?error}
       GFD_SERVICE_ACCOUNT: ${GFD_SERVICE_ACCOUNT?error}
       IFRC_DATA_URL: ${IFRC_DATA_URL?error}
+      PDC_AUTHORIZATION_KEY: ${PDC_AUTHORIZATION_KEY?error}
+      PDC_BASE_URL: ${PDC_BASE_URL?error}
+      ARC_DOMAIN: ${ARC_DOMAIN?error}
+      ARC_USERNAME: ${ARC_USERNAME?error}
+      ARC_PASSWORD: ${ARC_PASSWORD?error}
       # ETL Load
       EOAPI_DOMAIN: ${EOAPI_DOMAIN?error}
   volumes:
diff --git a/helm/templates/config/secret.yaml b/helm/templates/config/secret.yaml
index a32cd15..cd4c599 100644
--- a/helm/templates/config/secret.yaml
+++ b/helm/templates/config/secret.yaml
@@ -25,6 +25,8 @@ stringData:
   PDC_BASE_URL: {{ required "secrets.PDC_BASE_URL" .Values.secrets.PDC_BASE_URL | quote }}
   ARC_USERNAME: {{ required "secrets.ARC_USERNAME" .Values.secrets.ARC_USERNAME | quote }}
   ARC_PASSWORD: {{ required "secrets.ARC_PASSWORD" .Values.secrets.ARC_PASSWORD | quote }}
+  ARC_PASSWORD: {{ required "secrets.ARC_PASSWORD" .Values.secrets.ARC_PASSWORD | quote }}
+  ARC_DOMAIN: {{ required "secrets.ARC_DOMAIN" .Values.secrets.ARC_DOMAIN | quote }}
 
   # Database
   {{- if .Values.postgresql.enabled }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 0fa2f10..946e9fa 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -157,10 +157,6 @@ env:
   AZURE_STORAGE_STATIC_CONTAINER:
   # ETL Load config
   EOAPI_DOMAIN:
-  PDC_BASE_URL:
-  PDC_AUTHORIZATION_KEY:
-  ARC_DOMAIN:
-  ARC_USERNAME:
 # NOTE: Used to pass additional configs to api/worker containers
 # NOTE: Not used by azure vault
 envAdditional:
@@ -186,6 +182,11 @@ secrets:
   GFD_CREDENDIAL:
   GFD_SERVICE_ACCOUNT:
   IFRC_DATA_URL:
+  PDC_BASE_URL:
+  PDC_AUTHORIZATION_KEY:
+  ARC_DOMAIN:
+  ARC_USERNAME:
+  ARC_PASSWORD:
 # NOTE: Used to pass additional secrets to api/worker containers
 # NOTE: Not used by azure vault
 secretsAdditional: