Squashed commit of the following:

commit 15fe0dc Author: anuttinck <[email protected]> Date: Fri Jun 14 15:48:31 2024 +0200 [MOD] default initialDelaySeconds for livenessProbe and readnessProbe commit cedd97b Author: anuttinck <[email protected]> Date: Fri Jun 14 15:28:57 2024 +0200 [DEL] random totpVaultKey commit c7e1002 Author: anuttinck <[email protected]> Date: Fri Jun 14 13:50:12 2024 +0200 [ADD] livenessProbe and readinessProbe in values.yaml #11 commit 426df0d Merge: a246bbc 28c8b0d Author: anuttinck <[email protected]> Date: Fri Jun 14 13:17:46 2024 +0200 Merge branch 'main' of https://github.com/FyraLabs/helm-plausible-analytics into v0.3.0 commit a246bbc Author: Maxime VALETTE <[email protected]> Date: Fri Jun 14 13:06:33 2024 +0200 Remove deprecated db init-admin command (#15) * Remove deprecated db init-admin command https://github.com/plausible/analytics/blob/e522a2d7c182f5a0c7b2d95bf3ea248567a529e0/rel/overlays/init-admin.sh#L4-L5 * Chart version bump Signed-off-by: Maxime VALETTE <[email protected]> --------- Signed-off-by: Maxime VALETTE <[email protected]> Co-authored-by: Alexandre Nuttinck <[email protected]> commit 5db542b Author: Bing Steup <[email protected]> Date: Fri Jun 14 12:33:00 2024 +0200 Feat: apply nodeSelector, affinity and tolerations from values.yaml in deployment.yaml and bump version. Signed-off-by: Bing Steup <[email protected]> (#14) Co-authored-by: Alexandre Nuttinck <[email protected]> commit 198536f Author: anuttinck <[email protected]> Date: Fri Jun 14 12:27:17 2024 +0200 [FIX] MAILGUN_API_KEY in secrets.yaml commit 4dcebce Author: Martin Haug <[email protected]> Date: Fri Jun 14 12:23:43 2024 +0200 Fix SendGrid API key secret (#13) Signed-off-by: Martin Haug <[email protected]> commit 13eb40c Author: anuttinck <[email protected]> Date: Fri Jun 14 12:19:31 2024 +0200 Bump helm chart to 0.3.0 commit 28c8b0d Author: [email protected] <[email protected]> Date: Fri May 31 14:30:58 2024 -0700 chore: bump version to 0.2.5 Signed-off-by: [email protected] <[email protected]> commit 577df6d Author: lea <[email protected]> Date: Fri May 31 14:15:26 2024 -0700 fix: add newly required totpSecretKey option commit cf8e41b Author: lea <[email protected]> Date: Fri May 31 14:08:54 2024 -0700 chore: upgrade for Plausible v2.1.0
IMIO · Jun 14, 2024 · bbe8c63 · bbe8c63
1 parent 9217da3
commit bbe8c63
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 13 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -3,8 +3,8 @@ 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.4
-appVersion: 2.0.0
+version: 0.3.0
+appVersion: 2.1.1
 keywords:
   - web analytics
   - analytics

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -82,7 +82,7 @@ spec:
             - /bin/sh
             - -x
             - -c
-            - /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh db init-admin && /entrypoint.sh run
+            - /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run
           env:
             {{- if .Values.baseURL }}
             - name: BASE_URL
@@ -97,6 +97,11 @@ spec:
                 secretKeyRef:
                   key: SECRET_KEY_BASE
                   name: {{ include "plausible-analytics.secretName" . }}
+            - name: TOTP_VAULT_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: TOTP_VAULT_KEY
+                  name: {{ include "plausible-analytics.secretName" . }}
             {{- if .Values.disableRegistration }}
             - name: DISABLE_REGISTRATION
               value: {{ .Values.disableRegistration | toString | quote }}
@@ -229,12 +234,20 @@ spec:
               containerPort: 8000
               protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /
-              port: http
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: http
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           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
@@ -13,6 +13,7 @@ data:
   {{- else }}
   SECRET_KEY_BASE: {{ randAlphaNum 90 | toString | b64enc }}
   {{- end }}
+  TOTP_VAULT_KEY: {{ .Values.totpVaultKey | toString | b64enc }}
   {{- if .Values.databaseURL }}
   DATABASE_URL: {{ .Values.databaseURL | toString | b64enc }}
   {{- end }}
@@ -32,7 +33,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 +43,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 }}

diff --git a/values.yaml b/values.yaml
@@ -11,6 +11,7 @@
 baseURL: http://plausible-analytics.local  # The hosting url of the server
 listenIP: 0.0.0.0
 secretKeyBase: ""  # is automaticly generated if left empty
+totpVaultKey: "dsxvbn3jxDd16az2QpsX5B8O+llxjQ2SJE2i5Bzx38I="  # Should be updated! (TOTP_VAULT_KEY variable must exactly 32 bytes long)
 disableRegistration: false  # Restricts registration of new users.
 logFailedLoginAttempts: false  # Controls whether to log warnings about failed login attempts.
 
@@ -142,10 +143,10 @@ clickhouse:
 replicaCount: 1
 
 image:
-  repository: plausible/analytics
+  repository: plausible/community-edition
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v2.0.0"
+  tag: "v2.1.1"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -203,6 +204,18 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+    initialDelaySeconds: 30
+
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+    initialDelaySeconds: 30
+
 autoscaling:
   enabled: false
   minReplicas: 1