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

🔒️ Make Redis Client support TLS #6342

Merged
merged 7 commits into from
Sep 11, 2024
Merged

🔒️ Make Redis Client support TLS #6342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80fd760
Make redis support TLS
YuryHrytsuk Sep 10, 2024
ecb3e63
Merge remote-tracking branch 'upstream/master' into redis-client-tls-…
YuryHrytsuk Sep 10, 2024
e9ec87e
Add REDIS_SECURE to docker_compose.yml
YuryHrytsuk Sep 10, 2024
5b1ec39
Merge branch 'master' into redis-client-tls-support
YuryHrytsuk Sep 11, 2024
d61de42
Merge branch 'master' into redis-client-tls-support
YuryHrytsuk Sep 11, 2024
852dcac
Merge branch 'master' into redis-client-tls-support
YuryHrytsuk Sep 11, 2024
547d50f
Merge branch 'master' into redis-client-tls-support
YuryHrytsuk Sep 11, 2024
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
1 change: 1 addition & 0 deletions .env-devel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ RABBIT_USER=admin
REDIS_HOST=redis
REDIS_PORT=6379
REDIS_PASSWORD=adminadmin
REDIS_SECURE=false

REGISTRY_AUTH=True
REGISTRY_PW=adminadminadmin
Expand Down
3 changes: 2 additions & 1 deletion packages/settings-library/src/settings_library/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class RedisDatabase(int, Enum):

class RedisSettings(BaseCustomSettings):
# host
REDIS_SECURE: bool = False
REDIS_HOST: str = "redis"
REDIS_PORT: PortInt = parse_obj_as(PortInt, 6789)

Expand All @@ -30,7 +31,7 @@ class RedisSettings(BaseCustomSettings):

def build_redis_dsn(self, db_index: RedisDatabase):
return RedisDsn.build(
scheme="redis",
scheme="rediss" if self.REDIS_SECURE else "redis",
user=self.REDIS_USER or None,
password=(
self.REDIS_PASSWORD.get_secret_value() if self.REDIS_PASSWORD else None
Expand Down
9 changes: 9 additions & 0 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PASSWORD: ${REDIS_PASSWORD}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REGISTRY_USER: ${REGISTRY_USER}
REGISTRY_PW: ${REGISTRY_PW}
REGISTRY_URL: ${REGISTRY_URL}
Expand Down Expand Up @@ -204,6 +205,7 @@ services:
RABBIT_USER: ${RABBIT_USER}
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}
SWARM_STACK_NAME: ${SWARM_STACK_NAME}
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES: ${CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES}
Expand Down Expand Up @@ -331,6 +333,7 @@ services:

REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}

REGISTRY_AUTH: ${REGISTRY_AUTH}
Expand Down Expand Up @@ -475,6 +478,7 @@ services:
RABBIT_USER: ${RABBIT_USER}
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}
RESOURCE_USAGE_TRACKER_LOGLEVEL: ${RESOURCE_USAGE_TRACKER_LOGLEVEL}
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED}
Expand All @@ -498,6 +502,7 @@ services:
RABBIT_USER: ${RABBIT_USER}
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}
DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
Expand Down Expand Up @@ -659,6 +664,7 @@ services:
# WEBSERVER_REDIS
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}

# WEBSERVER_REST
Expand Down Expand Up @@ -846,6 +852,7 @@ services:
# WEBSERVER_REDIS
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}

RESOURCE_MANAGER_RESOURCE_TTL_S: ${RESOURCE_MANAGER_RESOURCE_TTL_S}
Expand Down Expand Up @@ -894,6 +901,7 @@ services:

REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}

SWARM_STACK_NAME: ${SWARM_STACK_NAME}
Expand Down Expand Up @@ -1032,6 +1040,7 @@ services:
POSTGRES_USER: ${POSTGRES_USER}
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_PASSWORD: ${REDIS_PASSWORD}
S3_ACCESS_KEY: ${S3_ACCESS_KEY}
S3_BUCKET_NAME: ${S3_BUCKET_NAME}
Expand Down
Loading