Merge pull request #17 from jessebot/add-context-to-all-sidekiq-values

added context to all sidekiq s3 secret values
small-hack · Oct 26, 2023 · 1d86cde · 1d86cde
2 parents ca80588 + fa3baab
commit 1d86cde
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 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.4
+version: 4.4.5
 
 # 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.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)
+![Version: 4.4.5](https://img.shields.io/badge/Version-4.4.5-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
@@ -117,36 +117,36 @@ spec:
             - name: "S3_HOSTNAME"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: {{ .Values.mastodon.s3.secretKeys.s3Hostname }}
+                  name: {{ $context.Values.mastodon.s3.existingSecret }}
+                  key: {{ $context.Values.mastodon.s3.secretKeys.s3Hostname }}
             {{- end }}
             - name: "S3_ENDPOINT"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: {{ .Values.mastodon.s3.secretKeys.s3Endpoint }}
+                  name: {{ $context.Values.mastodon.s3.existingSecret }}
+                  key: {{ $context.Values.mastodon.s3.secretKeys.s3Endpoint }}
             {{- if $context.Values.mastodon.s3.secretKeys.s3Region }}
             - name: "S3_REGION"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: {{ .Values.mastodon.s3.secretKeys.s3Region }}
+                  name: {{ $context.Values.mastodon.s3.existingSecret }}
+                  key: {{ $context.Values.mastodon.s3.secretKeys.s3Region }}
             {{- end }}
             - name: "S3_BUCKET"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: {{ .Values.mastodon.s3.secretKeys.s3Bucket }}
+                  name: {{ $context.Values.mastodon.s3.existingSecret }}
+                  key: {{ $context.Values.mastodon.s3.secretKeys.s3Bucket }}
             - name: "AWS_ACCESS_KEY_ID"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: {{ .Values.mastodon.s3.secretKeys.s3AccessKeyID }}
+                  name: {{ $context.Values.mastodon.s3.existingSecret }}
+                  key: {{ $context.Values.mastodon.s3.secretKeys.s3AccessKeyID }}
             - name: "AWS_SECRET_ACCESS_KEY"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: {{ .Values.mastodon.s3.secretKeys.s3AccessKey }}
+                  name: {{ $context.Values.mastodon.s3.existingSecret }}
+                  key: {{ $context.Values.mastodon.s3.secretKeys.s3AccessKey }}
             {{- end }}
           {{- if (not $context.Values.mastodon.s3.enabled) }}
           volumeMounts: