Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Back 1341 updates part 2 #250

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Back 1341 updates part 2 #250

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
876ff4a
updates for device logs
jh-bate Mar 6, 2023
d1f6855
change logs_bucket config location
jh-bate Mar 7, 2023
7017e5e
addition of S3_LOGS_BUCKET
jh-bate Mar 7, 2023
14c788c
seperate out config for blobs and device_logs
jh-bate Mar 8, 2023
5b33222
fix naming
jh-bate Mar 8, 2023
76c0697
updates for logs service endpoint config
jh-bate Mar 14, 2023
5ac6440
Merge branch 'master' into BACK-1341-updates
jh-bate Apr 18, 2023
fe96f3f
Merge branch 'master' into BACK-1341-updates
jh-bate Jul 24, 2023
b4f1677
change bucket name to be the same as blobs
jh-bate Aug 1, 2023
2e796e8
Merge branch 'master' into BACK-1341-updates
jh-bate Sep 19, 2023
6888a51
Merge branch 'master' into BACK-1341-updates
jh-bate Sep 27, 2023
ca3e5f8
Merge branch 'master' into BACK-1341-updates.2
jh-bate Oct 5, 2023
40f29ab
Merge branch 'master' into BACK-1341-updates.2
jh-bate Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,16 @@ TIDEPOOL_DOCKER_PLATFORM_BLOB_DIR=platform/src/github.com/tidepool-org/platform
TIDEPOOL_DOCKER_PLATFORM_BLOB_HOST=platform-blob
TIDEPOOL_DOCKER_PLATFORM_BLOB_PORT_PREFIX=
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_SECRET=Service secret used for interservice requests with the blob service
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE=file
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY=_data/blobs
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET=
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX=

TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE=file
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY=_data/blobs
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET=
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX=
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE=file
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY=_data/device_logs
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET=
TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX=


# platform-data
TIDEPOOL_DOCKER_PLATFORM_DATA_BUILD_TARGET=release
Expand Down
24 changes: 16 additions & 8 deletions charts/tidepool/charts/blob/templates/1-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,22 @@ spec:
key: ServiceAuth
- name: TIDEPOOL_BLOB_SERVICE_SERVER_ADDRESS
value: :{{.Values.global.ports.blob}}
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY
value: '{{.Values.deployment.env.store.file.directory}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET
value: '{{ .Values.deployment.env.store.s3.bucket }}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX
value: '{{.Values.deployment.env.store.s3.prefix}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
value: '{{.Values.deployment.env.store.type}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY
value: '{{.Values.deployment.env.blobs.store.file.directory}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET
value: '{{ .Values.deployment.env.blobs.store.s3.bucket }}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX
value: '{{.Values.deployment.env.blobs.store.s3.prefix}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE
value: '{{.Values.deployment.env.blobs.store.type}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY
value: '{{.Values.deployment.env.logs.store.file.directory}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET
value: '{{ .Values.deployment.env.logs.store.s3.bucket }}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX
value: '{{.Values.deployment.env.logs.store.s3.prefix}}'
- name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
value: '{{.Values.deployment.env.logs.store.type}}'
image: "{{ .Values.deployment.image }}"
securityContext:
{{- .Values.podSecurityContext | toYaml | nindent 10 }}
Expand Down
8 changes: 8 additions & 0 deletions charts/tidepool/charts/blob/templates/4-routetable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,12 @@ spec:
single:
upstream:
name: blob
- matchers:
- methods:
- POST
regex: /v1/users/[^/]+/device-logs
routeAction:
single:
upstream:
name: blob
{{- end }}
35 changes: 24 additions & 11 deletions charts/tidepool/charts/blob/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,30 @@ deployment:
# -- default Docker image
image: tidepool/platform-blob:master-latest
env:
store:
s3:
# -- S3 bucket where blob data is written
bucket: "data"
prefix: "blobs"
file:
prefix: "blobs"
# -- directory to use when storing blobs on file storage
directory: "_data/blobs"
# -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
type: file
blobs:
store:
s3:
# -- S3 bucket where blob data is written
bucket: "data"
prefix: "blobs"
file:
prefix: "blobs"
# -- directory to use when storing blobs on file storage
directory: "_data/blobs"
# -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
type: file
logs:
store:
s3:
# -- S3 bucket where device_logs blob data is written
bucket: "data"
prefix: "device_logs"
file:
prefix: "device_logs"
# -- directory to use when storing device_logs on file storage
directory: "_data/device_logs"
# -- if `s3`, store blob data in Amazon S3. If `file` store blob data in local files.
type: file
serviceAccount:
# -- whether to create a service account
create: false
Expand Down
12 changes: 8 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,14 @@ services:
TIDEPOOL_TASK_SERVICE_SERVER_ADDRESS: :${TIDEPOOL_DOCKER_PLATFORM_TASK_PORT_PREFIX}9224
TIDEPOOL_USER_SERVICE_SERVER_ADDRESS: :${TIDEPOOL_DOCKER_PLATFORM_USER_PORT_PREFIX}9221
TIDEPOOL_AUTH_SERVICE_DOMAIN: ${TIDEPOOL_DOCKER_API_HOST}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE: ${TIDEPOOL_DOCKER_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE: ${TIDEPOOL_DOCKER_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET}
TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX: ${TIDEPOOL_DOCKER_PLATFORM_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX}
TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_TYPE: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_TYPE}
TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY}
TIDEPOOL_IMAGE_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET: ${TIDEPOOL_DOCKER_PLATFORM_IMAGE_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET}
Expand Down