chore: configure sentry

misskey-dev · May 28, 2024 · 395a264 · 395a264
1 parent bc5e736
commit 395a264
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 72 deletions.
diff --git a/charts/misskey/templates/Deployment.yaml b/charts/misskey/templates/Deployment.yaml
@@ -14,24 +14,7 @@ spec:
       labels:
         app: {{ include "misskey.name" . }}
     spec:
-      initContainers:
-        - name: "{{ .Release.Name }}-init"
-          image: mikefarah/yq:4
-          imagePullPolicy: Always
-          command: ["/bin/sh"]
-          args: ["-c", "cp /mnt/misskey-configuration/default.yml /misskey/.config && /usr/bin/yq -i \".db.pass = \\\"$POSTGRESQL_PASS\\\"\" /misskey/.config/default.yml"]
-          env:
-            - name: POSTGRESQL_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: postgresql-ha-postgresql
-                  key: password
-          volumeMounts:
-            - name: {{ include "misskey.name" . }}-configuration-destination
-              mountPath: /misskey/.config
-            - name: {{ include "misskey.name" . }}-configuration
-              mountPath: /mnt/misskey-configuration
-              readOnly: true
+      initContainers: {{ include "misskey.initContainers" . | nindent 8 }}
       containers:
         - name: {{ include "misskey.name" . }}
           image: "{{ .Values.image.index }}"
@@ -61,12 +44,7 @@ spec:
               port: {{ .Values.port }}
             failureThreshold: 30
             periodSeconds: 1
-      volumes:
-        - name: {{ include "misskey.name" . }}-configuration-destination
-          emptyDir: {}
-        - name: {{ include "misskey.name" . }}-configuration
-          configMap:
-            name: {{ include "misskey.name" . }}-configuration
+      volumes: {{ include "misskey.volumes" . | nindent 8 }}
   strategy:
     type: RollingUpdate
     rollingUpdate:

diff --git a/charts/misskey/templates/PreInstallJob.yaml b/charts/misskey/templates/PreInstallJob.yaml
@@ -12,24 +12,7 @@ spec:
       name: "{{ .Release.Name }}"
     spec:
       restartPolicy: Never
-      initContainers:
-        - name: "{{ .Release.Name }}-init"
-          image: mikefarah/yq:4
-          imagePullPolicy: Always
-          command: ["/bin/sh"]
-          args: ["-c", "cp /mnt/misskey-configuration/default.yml /misskey/.config && /usr/bin/yq -i \".db.pass = \\\"$POSTGRESQL_PASS\\\"\" /misskey/.config/default.yml"]
-          env:
-            - name: POSTGRESQL_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: postgresql-ha-postgresql
-                  key: password
-          volumeMounts:
-            - name: {{ include "misskey.name" . }}-configuration-destination
-              mountPath: /misskey/.config
-            - name: {{ include "misskey.name" . }}-configuration
-              mountPath: /mnt/misskey-configuration
-              readOnly: true
+      initContainers: {{ include "misskey.initContainers" . | nindent 8 }}
       containers:
         - name: "{{ .Release.Name }}"
           image: "{{ .Values.image.index }}"
@@ -45,9 +28,4 @@ spec:
           image: public.ecr.aws/docker/library/redis:7.2.4-alpine
           command: ["/usr/local/bin/redis-cli"]
           args: ["-h", "{{ .Values.redis.host }}",{{ if .Values.redis.port }} "-p", "{{ .Values.redis.port }}",{{ end }} "CONFIG", "SET", "maxmemory-policy", "noeviction"]
-      volumes:
-        - name: {{ include "misskey.name" . }}-configuration-destination
-          emptyDir: {}
-        - name: {{ include "misskey.name" . }}-configuration
-          configMap:
-            name: {{ include "misskey.name" . }}-configuration
+      volumes: {{ include "misskey.volumes" . | nindent 8 }}
diff --git a/charts/misskey/templates/PreUpgradeJob.yaml b/charts/misskey/templates/PreUpgradeJob.yaml
@@ -12,24 +12,7 @@ spec:
       name: "{{ .Release.Name }}"
     spec:
       restartPolicy: Never
-      initContainers:
-        - name: "{{ .Release.Name }}-init"
-          image: mikefarah/yq:4
-          imagePullPolicy: Always
-          command: ["/bin/sh"]
-          args: ["-c", "cp /mnt/misskey-configuration/default.yml /misskey/.config && /usr/bin/yq -i \".db.pass = \\\"$POSTGRESQL_PASS\\\"\" /misskey/.config/default.yml"]
-          env:
-            - name: POSTGRESQL_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: postgresql-ha-postgresql
-                  key: password
-          volumeMounts:
-            - name: {{ include "misskey.name" . }}-configuration-destination
-              mountPath: /misskey/.config
-            - name: {{ include "misskey.name" . }}-configuration
-              mountPath: /mnt/misskey-configuration
-              readOnly: true
+      initContainers: {{ include "misskey.initContainers" . | nindent 8 }}
       containers:
         - name: "{{ .Release.Name }}"
           image: "{{ .Values.image.index }}"
@@ -41,9 +24,4 @@ spec:
           volumeMounts:
             - name: {{ include "misskey.name" . }}-configuration-destination
               mountPath: /misskey/.config
-      volumes:
-        - name: {{ include "misskey.name" . }}-configuration-destination
-          emptyDir: {}
-        - name: {{ include "misskey.name" . }}-configuration
-          configMap:
-            name: {{ include "misskey.name" . }}-configuration
+      volumes: {{ include "misskey.volumes" . | nindent 8 }}
diff --git a/charts/misskey/templates/_helpers.tpl b/charts/misskey/templates/_helpers.tpl
@@ -1,3 +1,36 @@
 {{- define "misskey.name" -}}
 misskey-{{- default .Values.host | replace "." "-" -}}
 {{- end -}}
+
+{{- define "misskey.initContainers" -}}
+- name: "{{ .Release.Name }}-init"
+  image: mikefarah/yq:4
+  imagePullPolicy: Always
+  command: ["/bin/sh"]
+  args: ["-c", "cp /mnt/misskey-configuration/default.yml /misskey/.config && /usr/bin/yq -i \".db.pass = \\\"$POSTGRESQL_PASS\\\", .sentryForBackend.options.dsn = \\\"$SENTRY_BACKEND_DSN\\\"\" /misskey/.config/default.yml"]
+  env:
+    - name: POSTGRESQL_PASS
+      valueFrom:
+        secretKeyRef:
+          name: postgresql-ha-postgresql
+          key: password
+    - name: SENTRY_BACKEND_DSN
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "misskey.name" . }}
+          key: sentry-backend-dsn
+  volumeMounts:
+    - name: {{ include "misskey.name" . }}-configuration-destination
+      mountPath: /misskey/.config
+    - name: {{ include "misskey.name" . }}-configuration
+      mountPath: /mnt/misskey-configuration
+      readOnly: true
+{{- end }}
+
+{{- define "misskey.volumes" -}}
+- name: {{ include "misskey.name" . }}-configuration-destination
+  emptyDir: {}
+- name: {{ include "misskey.name" . }}-configuration
+  configMap:
+    name: {{ include "misskey.name" . }}-configuration
+{{- end}}
diff --git a/charts/misskey/values.yaml b/charts/misskey/values.yaml
@@ -13,6 +13,8 @@ redis:
   family: 0
 misskey:
   id: aidx
+  sentryForBackend:
+    enableNodeProfiling: true
   proxyBypassHosts:
     - challenges.cloudflare.com
   proxyRemoteFiles: true