From 595f2f46af444c565b027cc585927aa6c13ab50a Mon Sep 17 00:00:00 2001
From: Fabrice Brito <fabrice.brito@terradue.com>
Date: Tue, 17 Oct 2023 10:17:17 +0200
Subject: [PATCH] update for s3

---
 charts/calrissian-session/Chart.yaml          |  2 +-
 .../templates/{cr_cm.yaml => cm_cr.yaml}      |  0
 ...selector_cm.yaml => cm_node_selector.yaml} |  0
 .../{s3config.yaml => cm_s3config.yaml}       |  0
 .../{s3creds_cm.yaml => cm_s3creds.yaml}      |  0
 .../templates/cm_user_settings.yaml           | 24 +++++++++++++++++++
 .../templates/deployment.yaml                 |  6 +++++
 7 files changed, 31 insertions(+), 1 deletion(-)
 rename charts/calrissian-session/templates/{cr_cm.yaml => cm_cr.yaml} (100%)
 rename charts/calrissian-session/templates/{node_selector_cm.yaml => cm_node_selector.yaml} (100%)
 rename charts/calrissian-session/templates/{s3config.yaml => cm_s3config.yaml} (100%)
 rename charts/calrissian-session/templates/{s3creds_cm.yaml => cm_s3creds.yaml} (100%)
 create mode 100644 charts/calrissian-session/templates/cm_user_settings.yaml

diff --git a/charts/calrissian-session/Chart.yaml b/charts/calrissian-session/Chart.yaml
index 82afe4a..58b7806 100644
--- a/charts/calrissian-session/Chart.yaml
+++ b/charts/calrissian-session/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.10
+version: 0.1.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/calrissian-session/templates/cr_cm.yaml b/charts/calrissian-session/templates/cm_cr.yaml
similarity index 100%
rename from charts/calrissian-session/templates/cr_cm.yaml
rename to charts/calrissian-session/templates/cm_cr.yaml
diff --git a/charts/calrissian-session/templates/node_selector_cm.yaml b/charts/calrissian-session/templates/cm_node_selector.yaml
similarity index 100%
rename from charts/calrissian-session/templates/node_selector_cm.yaml
rename to charts/calrissian-session/templates/cm_node_selector.yaml
diff --git a/charts/calrissian-session/templates/s3config.yaml b/charts/calrissian-session/templates/cm_s3config.yaml
similarity index 100%
rename from charts/calrissian-session/templates/s3config.yaml
rename to charts/calrissian-session/templates/cm_s3config.yaml
diff --git a/charts/calrissian-session/templates/s3creds_cm.yaml b/charts/calrissian-session/templates/cm_s3creds.yaml
similarity index 100%
rename from charts/calrissian-session/templates/s3creds_cm.yaml
rename to charts/calrissian-session/templates/cm_s3creds.yaml
diff --git a/charts/calrissian-session/templates/cm_user_settings.yaml b/charts/calrissian-session/templates/cm_user_settings.yaml
new file mode 100644
index 0000000..4f66e00
--- /dev/null
+++ b/charts/calrissian-session/templates/cm_user_settings.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.s3.enabled -}}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: user-settings
+  namespace: {{ .Release.Namespace }}
+data:
+  user-settings: |
+    {
+        "S3": {
+            "Services": {
+                "iride": {
+                    "UrlPattern":  {{ .Values.s3.bucket_pattern }},
+                    "Region":  {{ .Values.s3.region }},
+                    "AuthenticationRegion":  {{ .Values.s3.region }},
+                    "AccessKey": {{ .Values.s3.access_key_id }},
+                    "SecretKey": {{ .Values.s3.secret_access_key }},
+                    "ServiceURL": {{ .Values.s3.endpoint_url }},
+                    "ForcePathStyle": true
+                }
+            }
+        }
+    }
+{{- end}}
\ No newline at end of file
diff --git a/charts/calrissian-session/templates/deployment.yaml b/charts/calrissian-session/templates/deployment.yaml
index bee04aa..38700c9 100644
--- a/charts/calrissian-session/templates/deployment.yaml
+++ b/charts/calrissian-session/templates/deployment.yaml
@@ -58,6 +58,9 @@ spec:
           - name: aws-credentials
             mountPath: /home/.aws/credentials
             subPath: aws-credentials
+          - name: user-settings
+            mountPath: /etc/Stars/appsettings.json
+            subPath: user-settings
           {{- end }}  
           {{- if .Values.containerRegistry.enabled }}
           - name: container-registry
@@ -96,6 +99,9 @@ spec:
       - name: aws-credentials
         configMap:
           name: aws-credentials
+      - name: user-settings
+        configMap:
+          name: user-settings
       {{- end }}
       {{- if .Values.containerRegistry.enabled }}
       - name: container-registry