Merge pull request #16 from jessebot/add-context-to-sidekiq

add context to sidekick values evaluation for deployment s3 secrets
small-hack · Oct 26, 2023 · ca80588 · ca80588
2 parents 18bec67 + afcdec8
commit ca80588
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.4.3
+version: 4.4.4
 
 # renovate: image=ghcr.io/mastodon/mastodon
 appVersion: v4.2.1

diff --git a/charts/mastodon/README.md b/charts/mastodon/README.md
@@ -1,6 +1,6 @@
 # mastodon
 
-![Version: 4.4.3](https://img.shields.io/badge/Version-4.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.2.1](https://img.shields.io/badge/AppVersion-v4.2.1-informational?style=flat-square)
+![Version: 4.4.4](https://img.shields.io/badge/Version-4.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.2.1](https://img.shields.io/badge/AppVersion-v4.2.1-informational?style=flat-square)
 
 Mastodon is a free, open-source social network server based on ActivityPub.
 

diff --git a/charts/mastodon/templates/deployment-sidekiq.yaml b/charts/mastodon/templates/deployment-sidekiq.yaml
@@ -113,7 +113,7 @@ spec:
                   name: {{ include "mastodon.smtp.secretName" $context }}
                   key: password
             {{- if (and $context.Values.mastodon.s3.enabled $context.Values.mastodon.s3.existingSecret) }}
-            {{- if .Values.mastodon.s3.secretKeys.s3Hostname }}
+            {{- if $context.Values.mastodon.s3.secretKeys.s3Hostname }}
             - name: "S3_HOSTNAME"
               valueFrom:
                 secretKeyRef:
@@ -125,7 +125,7 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.mastodon.s3.existingSecret }}
                   key: {{ .Values.mastodon.s3.secretKeys.s3Endpoint }}
-            {{- if .Values.mastodon.s3.secretKeys.s3Region }}
+            {{- if $context.Values.mastodon.s3.secretKeys.s3Region }}
             - name: "S3_REGION"
               valueFrom:
                 secretKeyRef: