Merge branch 'v0.3.0' into patch-1

IMIO · Jun 14, 2024 · 9605844 · 9605844
2 parents 34dfaa4 + 5db542b
commit 9605844
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: plausible-analytics
 description: A Helm Chart for Plausible Analytics - Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics.
 type: application
-version: 0.2.5
+version: 0.3.0
 appVersion: 2.0.0
 keywords:
   - web analytics

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -238,3 +238,15 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/templates/secret.yaml b/templates/secret.yaml
@@ -32,7 +32,7 @@ data:
   {{- end }}
   {{- if eq .Values.mailer.adapter "Bamboo.MailgunAdapter" }}
   {{- if .Values.mailer.mailgun.apiKey }}
-  MAILGUN_API_KEY: {{ .Values.mailgun.apiKey | toString | b64enc }}
+  MAILGUN_API_KEY: {{ .Values.mailer.mailgun.apiKey | toString | b64enc }}
   {{- end }}
   {{- end }}
   {{- if eq .Values.mailer.adapter "Bamboo.MandrillAdapter" }}
@@ -42,7 +42,7 @@ data:
   {{- end }}
   {{- if eq .Values.mailer.adapter "Bamboo.SendGridAdapter" }}
   {{- if .Values.mailer.sendgridApiKey }}
-  SENDGRID_API_KEY: {{ .Values.mailgun.sendgridApiKey | toString | b64enc }}
+  SENDGRID_API_KEY: {{ .Values.mailer.sendgridApiKey | toString | b64enc }}
   {{- end }}
   {{- end }}
   {{- end }}