Merge branch 'develop' of github.com:EOEPCA/eoepca into develop

EOEPCA · Mar 27, 2023 · c769e57 · c769e57
2 parents 709ccf4 + 04a2444
commit c769e57
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/system/clusters/creodias/processing-and-chaining/proc-ades.yaml b/system/clusters/creodias/processing-and-chaining/proc-ades.yaml
@@ -157,14 +157,13 @@ spec:
               - entryname: stageout.sh
                 entry: |-
                   #!/bin/bash
-                  AWS__ServiceURL=$(inputs.ADES_STAGEOUT_AWS_SERVICEURL)
-                  AWS__Region=$(inputs.ADES_STAGEOUT_AWS_REGION)
-                  AWS__AuthenticationRegion=$(inputs.ADES_STAGEOUT_AWS_REGION)
-                  AWS_ACCESS_KEY_ID=$(inputs.ADES_STAGEOUT_AWS_ACCESS_KEY_ID)
-                  AWS_SECRET_ACCESS_KEY=$(inputs.ADES_STAGEOUT_AWS_SECRET_ACCESS_KEY)
-
-                  Stars copy -v -r 4 -o $( inputs.ADES_STAGEOUT_OUTPUT + "/" + inputs.process ) \
-                  $(inputs.wf_outputs.path) + "/catalog.json"
+                  export AWS__ServiceURL=$(inputs.ADES_STAGEOUT_AWS_SERVICEURL)
+                  export AWS__Region=$(inputs.ADES_STAGEOUT_AWS_REGION)
+                  export AWS__AuthenticationRegion=$(inputs.ADES_STAGEOUT_AWS_REGION)
+                  export AWS_ACCESS_KEY_ID=$(inputs.ADES_STAGEOUT_AWS_ACCESS_KEY_ID)
+                  export AWS_SECRET_ACCESS_KEY=$(inputs.ADES_STAGEOUT_AWS_SECRET_ACCESS_KEY)
+                  echo "Stars copy -v -r 4 -o $(inputs.ADES_STAGEOUT_OUTPUT)/$(inputs.process) $(inputs.wf_outputs.path)/catalog.json""
+                  Stars copy -v -r 4 -o $(inputs.ADES_STAGEOUT_OUTPUT)/$(inputs.process) $(inputs.wf_outputs.path)/catalog.json"
 
 
       stagein:

diff --git a/...em/clusters/creodias/resource-management/rm-workspace-charts/template-hr-data-access.yaml b/...em/clusters/creodias/resource-management/rm-workspace-charts/template-hr-data-access.yaml
@@ -21,13 +21,15 @@ spec:
 
       # the tls host is still needed to provide the hostname for the view server client
       ingress:
+        enabled: true
+        hosts:
+          - host: data-access.subpath.develop.eoepca.org
         tls:
           - hosts:
-              - data-access.{{ workspace_name }}.develop.eoepca.org
-
-      prefix:
-        enabled: false
-        value: "{{ workspace_name }}"
+              - data-access.subpath.develop.eoepca.org
+        prefix:
+          enabled: true
+          value: "{{ workspace_name }}"
 
       storage:
         data:
@@ -69,7 +71,11 @@ spec:
       renderer:
         replicaCount: 1
         ingress:
-          enabled: false
+          enabled: true
+          hosts:
+          - host: data-access.subpath.develop.eoepca.org
+
+
         # resources:
         #   limits:
         #     cpu: 1.5
@@ -165,7 +171,9 @@ spec:
 
       client:
         ingress:
-          enabled: false
+          enabled: true
+          hosts:
+          - host: data-access.subpath.develop.eoepca.org
         config:
           eoxserverDownloadEnabled: true
         #   timeDomain:
@@ -207,14 +215,21 @@ spec:
       ingestor:
         replicaCount: 0
         ingress:
-          enabled: false
+          enabled: false  # doesn't support subpaths yet
+          hosts:
+          - host: data-access.subpath.develop.eoepca.org
+
 
       preprocessor:
         replicaCount: 0
 
       cache:
         ingress:
-          enabled: false
+          enabled: true
+          hosts:
+          - host: data-access.subpath.develop.eoepca.org
+
+
 
       seeder:
         config: