Skip to content
Snippets Groups Projects
Verified Commit 0497912d authored by David Hoese's avatar David Hoese
Browse files

Attempt to fix s3 endpoint host and port handling

parent 07aa4054
No related branches found
No related tags found
1 merge request!5Add initial attempt at S3 geotiff reading
Pipeline #39950 failed with stages
in 7 minutes and 24 seconds
......@@ -80,7 +80,12 @@ spec:
valueFrom:
configMapKeyRef:
name: "{{ .Values.imageSource.s3ConfigMap }}"
key: "{{ .Values.imageSource.s3EndpointHostKey }}:{{ .Values.imageSource.s3EndpointPortKey }}"
key: "{{ .Values.imageSource.s3EndpointHostKey }}"
- name: "AWS_S3_ENDPOINT_PORT"
valueFrom:
configMapKeyRef:
name: "{{ .Values.imageSource.s3ConfigMap }}"
key: "{{ .Values.imageSource.s3EndpointHostPortKey }}"
{{- else }}
- name: "AWS_S3_ENDPOINT"
value: "{{ .Values.imageSource.s3Endpoint }}"
......
......@@ -76,7 +76,7 @@ start_pg_test_container() {
}
start_s3_pg_test_container() {
start_pg_test_container -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} -e AWS_S3_ENDPOINT="${MINIO_SERVER_NAME}:9000"
start_pg_test_container -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} -e AWS_S3_ENDPOINT="${MINIO_SERVER_NAME}" -e AWS_S3_ENDPOINT_PORT="9000"
}
start_postgres() {
......
......@@ -13,6 +13,10 @@ replace_pg_params() {
# Load environment variable options to overwrite in the config
export LAYER_BASE_DIR=${LAYER_BASE_DIR:-"/data/tiles"}
if [[ -n ${AWS_S3_ENDPOINT} ]] && [[ -n ${AWS_S3_ENDPOINT_PORT} ]]; then
export AWS_S3_ENDPOINT="${AWS_S3_ENDPOINT}:${AWS_S3_ENDPOINT_PORT}"
fi
# Update the mapcache.xml file with the real host and port name
mf_tmpl="/work/abi_l1b_template.map"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment