From 0300990afdfcbc7721b4c9616b89c90f89cb8413 Mon Sep 17 00:00:00 2001
From: nleconte-csgroup <nicolas.leconte@csgroup.eu>
Date: Thu, 15 Feb 2024 15:59:45 +0100
Subject: [PATCH] wip: fix cred in clear text in config

---
 charts/rs-server-adgs/templates/configmap.yaml   | 7 ++-----
 charts/rs-server-adgs/templates/deployment.yaml  | 4 ++--
 charts/rs-server-cadip/templates/configmap.yaml  | 7 ++-----
 charts/rs-server-cadip/templates/deployment.yaml | 4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/charts/rs-server-adgs/templates/configmap.yaml b/charts/rs-server-adgs/templates/configmap.yaml
index e7cef93..ce543ad 100644
--- a/charts/rs-server-adgs/templates/configmap.yaml
+++ b/charts/rs-server-adgs/templates/configmap.yaml
@@ -6,13 +6,10 @@ metadata:
   
 data:
   {{ .Values.app.eodagConfigFile }}: |-
-    ADGS:
+    adgs:
       auth:
         type: GenericAuth
         method: basic
-        credentials:
-            username: {{ .Values.app.station.endpoint.secret.username }}
-            password: {{ .Values.app.station.endpoint.secret.password }}
       products:
         GENERIC_PRODUCT_TYPE:
           productType: '{productType}'
@@ -73,5 +70,5 @@ data:
             downloadLink: '{{ .Values.app.station.endpoint.url }}({uid})/$value'
   {{ .Values.app.stationConfigFile }}: |-
     {
-      "ADGS": "{{ .Values.app.station.endpoint.url }}"
+      "adgs": "{{ .Values.app.station.endpoint.url }}"
     }
\ No newline at end of file
diff --git a/charts/rs-server-adgs/templates/deployment.yaml b/charts/rs-server-adgs/templates/deployment.yaml
index 6950833..52e9da0 100644
--- a/charts/rs-server-adgs/templates/deployment.yaml
+++ b/charts/rs-server-adgs/templates/deployment.yaml
@@ -83,12 +83,12 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name }}-obs
               key: sk
-        - name: STATION_USER
+        - name: EODAG__adgs__auth__credentials__username
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-endpoint
               key: user
-        - name: STATION_PASS
+        - name: EODAG__adgs__auth__credentials__password
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-endpoint
diff --git a/charts/rs-server-cadip/templates/configmap.yaml b/charts/rs-server-cadip/templates/configmap.yaml
index 2b70bd4..00711ec 100644
--- a/charts/rs-server-cadip/templates/configmap.yaml
+++ b/charts/rs-server-cadip/templates/configmap.yaml
@@ -6,13 +6,10 @@ metadata:
   
 data:
   {{ .Values.app.eodagConfigFile }}: |-
-    CADIP:
+    cadip:
       auth:
         type: GenericAuth
         method: basic
-        credentials:
-            username: {{ .Values.app.station.endpoint.secret.username }}
-            password: {{ .Values.app.station.endpoint.secret.password }}
       products:
         GENERIC_PRODUCT_TYPE:
           productType: '{productType}'
@@ -86,5 +83,5 @@ data:
             downloadLink: 'http://127.0.0.1:5000/Files({uid})/$value'
   {{ .Values.app.stationConfigFile }}: |-
     {
-      "CADIP": "{{ .Values.app.station.endpoint.url }}"
+      "cadip": "{{ .Values.app.station.endpoint.url }}"
     }
\ No newline at end of file
diff --git a/charts/rs-server-cadip/templates/deployment.yaml b/charts/rs-server-cadip/templates/deployment.yaml
index d4f82d7..eeab8d9 100644
--- a/charts/rs-server-cadip/templates/deployment.yaml
+++ b/charts/rs-server-cadip/templates/deployment.yaml
@@ -83,12 +83,12 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name }}-obs
               key: sk
-        - name: STATION_USER
+        - name: EODAG__cadip__auth__credentials__username
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-endpoint
               key: user
-        - name: STATION_PASS
+        - name: EODAG__cadip__auth__credentials__password
           valueFrom:
             secretKeyRef:
               name: {{ .Release.Name }}-endpoint