update for s3

Terradue · Oct 17, 2023 · 595f2f4 · 595f2f4
1 parent 488c46c
commit 595f2f4
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 1 deletion.
diff --git 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/...s/calrissian-session/templates/cr_cm.yaml → ...s/calrissian-session/templates/cm_cr.yaml b/...s/calrissian-session/templates/cr_cm.yaml → ...s/calrissian-session/templates/cm_cr.yaml
diff --git a/...n-session/templates/node_selector_cm.yaml → ...n-session/templates/cm_node_selector.yaml b/...n-session/templates/node_selector_cm.yaml → ...n-session/templates/cm_node_selector.yaml
diff --git a/...alrissian-session/templates/s3config.yaml → ...issian-session/templates/cm_s3config.yaml b/...alrissian-session/templates/s3config.yaml → ...issian-session/templates/cm_s3config.yaml
diff --git a/...rissian-session/templates/s3creds_cm.yaml → ...rissian-session/templates/cm_s3creds.yaml b/...rissian-session/templates/s3creds_cm.yaml → ...rissian-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
@@ -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}}
diff --git 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