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.

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

fix: add envFrom secretRef #3840

Merged
merged 1 commit into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 27 additions & 24 deletions k8s/django-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ data:
# --------------------------------

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY: "" # secret
# SECRET_KEY: "" # secret

# Django Database name
DATABASES_NAME: "mailarch"
# DATABASES_NAME: "mailarch"

# Django Database user
DATABASES_USER: "mailarch"
# DATABASES_USER: "mailarch"

# Django Database password
DATABASES_PASSWORD: "" # secret
# DATABASES_PASSWORD: "" # secret

# Django Database host
DATABASES_HOST: ""
# DATABASES_HOST: ""

# Django Database port
DATABASES_PORT: "5432"
# DATABASES_PORT: "5432"

# Django Database options
DATABASES_OPTS_JSON: |-
{
"sslmode": "prefer",
"options": "-c search_path=mailarch,django,public"
}
# DATABASES_OPTS_JSON: |-
# {
# "sslmode": "prefer",
# "options": "-c search_path=mailarch,django,public"
# }

# A list of strings representing the host/domain names that this Django site can serve.
ALLOWED_HOSTS: ".ietf.org"
Expand Down Expand Up @@ -60,19 +60,19 @@ data:
LOG_DIR: '/var/log/mail-archive'

# API Key for importing messages
IMPORT_MESSAGE_APIKEY: "" # secret
# IMPORT_MESSAGE_APIKEY: "" # secret

# Celery Broker URL
CELERY_BROKER_URL: "amqp://user:bugsbunny@mailarchive-rabbitmq:5672//"

# Datatracker Key for looking up related emails
DATATRACKER_PERSON_ENDPOINT_API_KEY: "" # secret
# DATATRACKER_PERSON_ENDPOINT_API_KEY: "" # secret

# OIDC Relying Party Client ID
OIDC_RP_CLIENT_ID: "" # secret
# OIDC_RP_CLIENT_ID: "" # secret

# OIDC Relying Party Client Secret
OIDC_RP_CLIENT_SECRET: "" # secret
# OIDC_RP_CLIENT_SECRET: "" # secret

# Memcached Host
MEMCACHED_SERVICE_HOST: "mailarchive-memcached"
Expand All @@ -81,7 +81,7 @@ data:
SCOUT_MONITOR: "False"

# Scout Key
SCOUT_KEY: "" # secret
# SCOUT_KEY: "" # secret

# Scout Name
SCOUT_NAME: "Mailarchive"
Expand All @@ -92,32 +92,35 @@ data:
ELASTICSEARCH_HOST: ""

# Elasticsearch password
ELASTICSEARCH_PASSWORD: "this-is-a-secret" # secret
# ELASTICSEARCH_PASSWORD: "this-is-a-secret" # secret

# CDN SETTINGS ---------------------

# Using a CDN. True only for production
USING_CDN: "False"

# Cloudflare Auth Email
CLOUDFLARE_AUTH_EMAIL: "" # secret
# CLOUDFLARE_AUTH_EMAIL: "" # secret

# Cloudflare Auth Key
CLOUDFLARE_AUTH_KEY: "" # secret
# CLOUDFLARE_AUTH_KEY: "" # secret

# Cloudflare Zone ID
CLOUDFLARE_ZONE_ID: "" #secret
# CLOUDFLARE_ZONE_ID: "" #secret

# MAILMAN SETTINGS -----------------

# Mailman API User
MAILMAN_API_USER: "" # secret
# MAILMAN_API_USER: "" # secret

# Mailman API Password
MAILMAN_API_PASSWORD: "" # secret
# MAILMAN_API_PASSWORD: "" # secret

# Mailman API URL
# MAILMAN_API_URL: "" # secret

# Mailman Cloudflare Client ID
MAILMAN_CF_ACCESS_CLIENT_ID: "" # secret
# MAILMAN_CF_ACCESS_CLIENT_ID: "" # secret

# Mailman Cloudflare Client Secret
MAILMAN_CF_ACCESS_CLIENT_SECRET: "" # secret
# MAILMAN_CF_ACCESS_CLIENT_SECRET: "" # secret
2 changes: 2 additions & 0 deletions k8s/mailarchive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ spec:
envFrom:
- configMapRef:
name: django-config
- secretRef:
name: ml-secrets-env
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down