diff --git a/.env b/.env index a27f6ba0..775b0b7d 100644 --- a/.env +++ b/.env @@ -77,11 +77,6 @@ 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 -# old config removed in https://github.com/tidepool-org/development/pull/250 -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 diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml index 2ea3dbc6..bee1fada 100644 --- a/charts/tidepool/charts/blob/templates/1-deployment.yaml +++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml @@ -56,14 +56,6 @@ 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 diff --git a/charts/tidepool/charts/blob/values.yaml b/charts/tidepool/charts/blob/values.yaml index 54c67b35..adf16e07 100644 --- a/charts/tidepool/charts/blob/values.yaml +++ b/charts/tidepool/charts/blob/values.yaml @@ -9,18 +9,6 @@ deployment: # -- default Docker image image: tidepool/platform-blob:master-latest env: - # old config removed in https://github.com/tidepool-org/development/pull/250 - 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: diff --git a/docker-compose.yml b/docker-compose.yml index 4e98a6aa..d37cbe55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -271,11 +271,6 @@ 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} - # old config removed in https://github.com/tidepool-org/development/pull/250 - 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}