From 8961e5c33056441884dc17b146917217f92efbf6 Mon Sep 17 00:00:00 2001 From: jessebot Date: Sun, 29 Dec 2024 20:02:56 +0100 Subject: [PATCH] template all the env vars out into the deployment --- charts/pixelfed/README.md | 2 +- charts/pixelfed/templates/deployment.yaml | 99 +++++++++++++++++++++++ charts/pixelfed/values.yaml | 2 +- 3 files changed, 101 insertions(+), 2 deletions(-) diff --git a/charts/pixelfed/README.md b/charts/pixelfed/README.md index 982f22a..1d77769 100644 --- a/charts/pixelfed/README.md +++ b/charts/pixelfed/README.md @@ -42,7 +42,7 @@ A Helm chart for deploying Pixelfed on Kubernetes | pixelfed.app.locale | string | `"en"` | change this to the language code of your pixelfed instance | | pixelfed.app.name | string | `"Pixelfed"` | The name of your server/instance | | pixelfed.app.url | string | `"https://localhost"` | change this to the domain of your pixelfed instance | -| pixelfed.config_cache | bool | `true` | Enable the config cache to allow you to manage settings via the admin dashboard | +| pixelfed.enable_config_cache | bool | `true` | Enable the config cache to allow you to manage settings via the admin dashboard | | pixelfed.enforce_email_verification | bool | `true` | Enforce email verification | | pixelfed.force_https_urls | bool | `true` | Force https url generation | | pixelfed.image_quality | int | `80` | Set the image optimization quality, between 1-100. Lower uses less space, higher more quality | diff --git a/charts/pixelfed/templates/deployment.yaml b/charts/pixelfed/templates/deployment.yaml index ab73d9a..e9d6594 100644 --- a/charts/pixelfed/templates/deployment.yaml +++ b/charts/pixelfed/templates/deployment.yaml @@ -40,6 +40,105 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP + env: + - name: APP_NAME + value: {{ .Values.pixelfed.app.name }} + - name: APP_ENV + value: {{ .Values.pixelfed.app.env }} + - name: APP_URL + value: {{ .Values.pixelfed.app.url }} + - name: APP_LOCALE + value: {{ .Values.pixelfed.app.locale }} + {{- with .Values.pixelfed.app.domain }} + - name: APP_DOMAIN + value: {{ . }} + {{- end }} + - name: OPEN_REGISTRATION + value: {{ .Values.pixelfed.open_registration }} + - name: ENFORCE_EMAIL_VERIFICATION + value: {{ .Values.pixelfed.enforce_email_verification }} + - name: IMAGE_QUALITY + value: {{ .Values.pixelfed.image_quality }} + - name: ACCOUNT_DELETION + value: {{ .Values.pixelfed.account_deletion }} + - name: OAUTH_ENABLED + value: {{ .Values.pixelfed.oauth_enabled }} + - name: MIN_PASSWORD_LENGTH + value: {{ .Values.pixelfed.min_password_length }} + - name: MAX_ACCOUNT_SIZE + value: {{ .Values.pixelfed.max_account_size }} + - name: MAX_PHOTO_SIZE + value: {{ .Values.pixelfed.max_photo_size }} + - name: MAX_AVATAR_SIZE + value: {{ .Values.pixelfed.max_avatar_size }} + - name: MAX_CAPTION_LENGTH + value: {{ .Values.pixelfed.max_caption_length }} + - name: MAX_BIO_LENGTH + value: {{ .Values.pixelfed.max_bio_length }} + - name: MAX_NAME_LENGTH + value: {{ .Values.pixelfed.max_name_length }} + - name: MAX_ALBUM_LENGTH + value: {{ .Values.pixelfed.max_album_length }} + - name: FORCE_HTTPS_URLS + value: {{ .Values.pixelfed.force_https_urls }} + - name: STORIES_ENABLED + value: {{ .Values.pixelfed.stories_enabled }} + - name: ENABLE_CONFIG_CACHE + value: {{ .Values.pixelfed.enable_config_cache }} + - name: INSTANCE_DESCRIPTION + value: {{ .Values.pixelfed.instance.description }} + - name: INSTANCE_CONTACT_FORM + value: {{ .Values.pixelfed.instance.contact_form | quote }} + - name: INSTANCE_DISCOVER_PUBLIC + value: {{ .Values.pixelfed.instance.discover_public | quote }} + - name: INSTANCE_PUBLIC_HASHTAGS + value: {{ .Values.pixelfed.instance.public_hashtags | quote }} + {{- with .Values.pixelfed.instance.contact_email }} + - name: INSTANCE_CONTACT_EMAIL + value: {{ .Values.pixelfed.instance.contact_email }} + {{- end }} + - name: INSTANCE_PROFILE_EMBEDS + value: {{ .Values.pixelfed.instance.profile_embeds | quote }} + - name: INSTANCE_POST_EMBEDS + value: {{ .Values.pixelfed.instance.post_embeds | quote }} + - name: INSTANCE_REPORTS_EMAIL_ENABLED + value: {{ .Values.pixelfed.instance.reports.email_enabled | quote }} + - name: INSTANCE_REPORTS_EMAIL_ADDRESSES + value: {{ join "," .Values.pixelfed.instance.reports.email_addresses }} + - name: INSTANCE_REPORTS_EMAIL_AUTOSPAM + value: {{ .Values.pixelfed.instance.reports.email_autospam | quote }} + - name: INSTANCE_LANDING_SHOW_DIRECTORY + value: {{ .Values.pixelfed.instance.landing.show_directory | quote }} + - name: INSTANCE_LANDING_SHOW_EXPLORE + value: {{ .Values.pixelfed.instance.landing.show_explore | quote }} + - name: INSTANCE_CUR_REG + value: {{ .Values.pixelfed.instance.cur_reg | quote }} + - name: INSTANCE_SHOW_PEERS + value: {{ .Values.pixelfed.instance.show_peers | quote }} + - name: PF_HIDE_NSFW_ON_PUBLIC_FEEDS + value: {{ .Values.pixelfed.pf.hide_nsfw_on_public_feeds | quote }} + - name: PF_LOCAL_AVATAR_TO_CLOUD + value: {{ .Values.pixelfed.pf.local_avatar_to_cloud | quote }} + - name: PF_ADMIN_INVITES_ENABLED + value: {{ .Values.pixelfed.pf.admin_invites_enabled | quote }} + - name: PF_MAX_USER_BLOCKS + value: {{ .Values.pixelfed.pf.max_user_blocks | quote }} + - name: PF_MAX_USER_MUTES + value: {{ .Values.pixelfed.pf.max_user_mutes | quote }} + - name: PF_MAX_DOMAIN_BLOCKS + value: {{ .Values.pixelfed.pf.max_domain_blocks | quote }} + - name: PF_ENABLE_CLOUD + value: {{ .Values.pixelfed.pf.enable_cloud | quote }} + - name: PF_MAX_USERS + value: {{ .Values.pixelfed.pf.max_users | quote }} + - name: PF_ENFORCE_MAX_USERS + value: {{ .Values.pixelfed.pf.enforce_max_users | quote }} + - name: PF_OPTIMIZE_IMAGES + value: {{ .Values.pixelfed.pf.optimize_images | quote }} + - name: PF_OPTIMIZE_VIDEOS + value: {{ .Values.pixelfed.pf.optimize_videos | quote }} + - name: PF_MAX_COLLECTION_LENGTH + value: {{ .Values.pixelfed.pf.max_collection_length | quote }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/charts/pixelfed/values.yaml b/charts/pixelfed/values.yaml index 927c6b5..32954fc 100644 --- a/charts/pixelfed/values.yaml +++ b/charts/pixelfed/values.yaml @@ -157,7 +157,7 @@ pixelfed: stories_enabled: false # -- Enable the config cache to allow you to manage settings via the admin dashboard - config_cache: true + enable_config_cache: true # -- Set the image optimization quality, between 1-100. Lower uses less space, higher more quality image_quality: 80