Skip to content

Reapply the new storage config #601

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

Merged
decko merged 2 commits into from
Jul 28, 2025
Merged

Reapply the new storage config #601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
239edec
Reapply "Remove usage of deprecated django storage settings (#581)" (…
decko Jul 25, 2025
3d3aab4
Update region_name
decko Jul 25, 2025
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
66 changes: 33 additions & 33 deletions deploy/clowdapp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ objects:
name: domain-storage-map
data:
domain-storage-script: |
from django.conf import settings as s
config = f"{{\"access_key\": \"{s.AWS_ACCESS_KEY_ID}\", \"secret_key\": \"{s.AWS_SECRET_ACCESS_KEY}\", \"bucket_name\": \"{s.AWS_STORAGE_BUCKET_NAME}\", \"region_name\": \"us-east-1\", \"default_acl\": \"private\"}}"
from django.conf import settings
s = settings.storages.default.options
config = f"{{\"access_key\": \"{s.access_key}\", \"secret_key\": \"{s.secret_key}\", \"bucket_name\": \"{s.bucket_name}\", \"region_name\": \"us-east-1\", \"default_acl\": \"private\"}}"
print(config)
- apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -126,16 +127,24 @@ objects:
REDIS_HOST = "$(cat /cdapp/cdappconfig.json | jq -r '.inMemoryDb.hostname')"
REDIS_PORT = "$(cat /cdapp/cdappconfig.json | jq -r '.inMemoryDb.port')"
REDIS_PASSWORD = ""
AWS_S3_ENDPOINT_URL = "http://${S3_HOSTNAME}:9000"
AWS_S3_REGION_NAME = "east"
AWS_ACCESS_KEY_ID = '$S3_ACCESS_KEY_ID'
AWS_SECRET_ACCESS_KEY = '$S3_SECRET_ACCESS_KEY'
AWS_STORAGE_BUCKET_NAME = '$S3_BUCKET_NAME'
AWS_DEFAULT_ACL = "@none None"
S3_USE_SIGV4 = True
AWS_S3_SIGNATURE_VERSION = "s3v4"
AWS_S3_ADDRESSING_STYLE = "path"
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
STORAGES = {
"default": {
"BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
"OPTIONS": {
"endpoint_url": "http://${S3_HOSTNAME}:9000",
"region_name": "us-east-1",
"access_key": "$S3_ACCESS_KEY_ID",
"secret_key": "$S3_SECRET_ACCESS_KEY",
"bucket_name": "$S3_BUCKET_NAME",
"default_acl": "@none None",
Copy link
Contributor

@sourcery-ai sourcery-ai bot Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question (bug_risk): The value '@none None' for 'default_acl' may not be recognized by all S3 backends.

Verify that '@none None' is a supported value for 'default_acl' with your S3 backend to avoid permission issues or errors.

"signature_version": "s3v4",
"addressing_style": "path",
},
},
"staticfiles": {
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
},
}
MEDIA_ROOT = ""
SECRET_KEY = secrets.token_urlsafe(50)
CONTENT_ORIGIN = "https://$HOST"
Expand Down Expand Up @@ -305,15 +314,13 @@ objects:
value: ${{PULP_DB_ENCRYPTION_KEY}}
- name: PULP_CACHE_ENABLED
value: ${PULP_CACHE_ENABLED}
- name: PULP_AWS_DEFAULT_ACL
- name: PULP_STORAGES__default__OPTIONS__default_acl
value: ${{PULP_AWS_DEFAULT_ACL}}
- name: PULP_S3_USE_SIGV4
value: ${PULP_S3_USE_SIGV4}
- name: PULP_AWS_S3_SIGNATURE_VERSION
- name: PULP_STORAGES__default__OPTIONS__signature_version
value: ${{PULP_AWS_S3_SIGNATURE_VERSION}}
- name: PULP_AWS_S3_ADDRESSING_STYLE
- name: PULP_STORAGES__default__OPTIONS__addressing_style
value: ${{PULP_AWS_S3_ADDRESSING_STYLE}}
- name: PULP_DEFAULT_FILE_STORAGE
- name: PULP_STORAGES__default__BACKEND
value: ${{PULP_DEFAULT_FILE_STORAGE}}
- name: PULP_MEDIA_ROOT
value: ${{PULP_MEDIA_ROOT}}
Expand Down Expand Up @@ -456,15 +463,13 @@ objects:
value: ${{PULP_DB_ENCRYPTION_KEY}}
- name: PULP_CACHE_ENABLED
value: ${PULP_CACHE_ENABLED}
- name: PULP_AWS_DEFAULT_ACL
- name: PULP_STORAGES__default__OPTIONS__default_acl
value: ${{PULP_AWS_DEFAULT_ACL}}
- name: PULP_S3_USE_SIGV4
value: ${PULP_S3_USE_SIGV4}
- name: PULP_AWS_S3_SIGNATURE_VERSION
- name: PULP_STORAGES__default__OPTIONS__signature_version
value: ${{PULP_AWS_S3_SIGNATURE_VERSION}}
- name: PULP_AWS_S3_ADDRESSING_STYLE
- name: PULP_STORAGES__default__OPTIONS__addressing_style
value: ${{PULP_AWS_S3_ADDRESSING_STYLE}}
- name: PULP_DEFAULT_FILE_STORAGE
- name: PULP_STORAGES__default__BACKEND
value: ${{PULP_DEFAULT_FILE_STORAGE}}
- name: PULP_MEDIA_ROOT
value: ${{PULP_MEDIA_ROOT}}
Expand Down Expand Up @@ -553,15 +558,13 @@ objects:
value: ${{PULP_DB_ENCRYPTION_KEY}}
- name: PULP_CACHE_ENABLED
value: ${PULP_CACHE_ENABLED}
- name: PULP_AWS_DEFAULT_ACL
- name: PULP_STORAGES__default__OPTIONS__default_acl
value: ${{PULP_AWS_DEFAULT_ACL}}
- name: PULP_S3_USE_SIGV4
value: ${PULP_S3_USE_SIGV4}
- name: PULP_AWS_S3_SIGNATURE_VERSION
- name: PULP_STORAGES__default__OPTIONS__signature_version
value: ${{PULP_AWS_S3_SIGNATURE_VERSION}}
- name: PULP_AWS_S3_ADDRESSING_STYLE
- name: PULP_STORAGES__default__OPTIONS__addressing_style
value: ${{PULP_AWS_S3_ADDRESSING_STYLE}}
- name: PULP_DEFAULT_FILE_STORAGE
- name: PULP_STORAGES__default__BACKEND
value: ${{PULP_DEFAULT_FILE_STORAGE}}
- name: PULP_MEDIA_ROOT
value: ${{PULP_MEDIA_ROOT}}
Expand Down Expand Up @@ -874,9 +877,6 @@ parameters:
- name: PULP_AWS_DEFAULT_ACL
description: AWS default ACL
value: "@none None"
- name: PULP_S3_USE_SIGV4
description: S3 using SIGV4
value: "true"
- name: PULP_AWS_S3_SIGNATURE_VERSION
description: S3 Signature version
value: "s3v4"
Expand Down