Skip to content

Commit

Permalink
Merge branch 'develop' into feat167/cadip-session
Browse files Browse the repository at this point in the history
  • Loading branch information
nleconte-csgroup authored Apr 18, 2024
2 parents a4097ec + 57ee57c commit 8ef5d8f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
9 changes: 8 additions & 1 deletion charts/rs-server-cadip/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ data:
metadata_mapping:
uid: '$.Id'
downloadLink: '{{ .Values.app.station.cadip.endpoint.url.file }}({uid})/$value'
mti:
auth:
type: GenericAuth
Expand Down Expand Up @@ -156,6 +157,7 @@ data:
metadata_mapping:
uid: '$.Id'
downloadLink: '{{ .Values.app.station.mti.endpoint.url.file }}({uid})/$value'
sgs:
auth:
type: GenericAuth
Expand Down Expand Up @@ -231,6 +233,7 @@ data:
metadata_mapping:
uid: '$.Id'
downloadLink: '{{ .Values.app.station.sgs.endpoint.url.file }}({uid})/$value'
cadip_session:
auth:
type: GenericAuth
Expand Down Expand Up @@ -341,6 +344,7 @@ data:
metadata_mapping:
uid: "$.Id"
downloadLink: "{{ .Values.app.station.cadip.endpoint.url.session }}({uid})/$value"
mti_session:
auth:
type: GenericAuth
Expand All @@ -351,6 +355,7 @@ data:
search:
type: ODataV4Search
api_endpoint: "{{ .Values.app.station.mti.endpoint.url.session }}"
need_auth: true
results_entry: responses | $
metadata_mapping:
Expand Down Expand Up @@ -451,6 +456,7 @@ data:
metadata_mapping:
uid: "$.Id"
downloadLink: "{{ .Values.app.station.mti.endpoint.url.session }}({uid})/$value"
sgs_session:
auth:
type: GenericAuth
Expand All @@ -461,6 +467,7 @@ data:
search:
type: ODataV4Search
api_endpoint: "{{ .Values.app.station.sgs.endpoint.url.session }}"
need_auth: true
results_entry: responses | $
metadata_mapping:
Expand Down Expand Up @@ -560,4 +567,4 @@ data:
base_uri: "{{ .Values.app.station.sgs.endpoint.url.session }}"
metadata_mapping:
uid: "$.Id"
downloadLink: "{{ .Values.app.station.sgs.endpoint.url.session }}({uid})/$value"
downloadLink: "{{ .Values.app.station.sgs.endpoint.url.session }}({uid})/$value"
3 changes: 3 additions & 0 deletions charts/rs-server-cadip/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ app:
url:
file: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files
session: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions

secret:
# -- Username to authenticate with the CADIP station
username: test
Expand All @@ -38,6 +39,7 @@ app:
url:
file: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/Files
session: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/Sessions

secret:
username: test
password: test
Expand All @@ -47,6 +49,7 @@ app:
url:
file: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/Files
session: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/Sessions

secret:
username: test
password: test
Expand Down

0 comments on commit 8ef5d8f

Please sign in to comment.