fix: helm chart issues

.gitignore

@@ -81,3 +81,7 @@ pnpm*
 # Nix Development shell items
 .devenv
 .direnv
+
+# helm chart dependencies
+chart/charts
+chart/Chart.lock

chart/templates/_helpers.tpl

@@ -119,10 +119,10 @@ port: 3000
 db:
   {{- if .Values.postgresql.enabled }}
   host: {{ template "iceshrimp.postgresql.fullname" . }}
-  port: '5432'
+  port: 5432
   {{- else }}
   host: {{ .Values.postgresql.postgresqlHostname }}
-  port: {{ .Values.postgresql.postgresqlPort | default "5432" | quote }}
+  port: {{ .Values.postgresql.postgresqlPort | default 5432 }}
   {{- end }}
 
   # Database name
@@ -130,7 +130,7 @@ db:
 
   # Auth
   user: {{ .Values.postgresql.auth.username }}
-  pass: "{{ .Values.postgresql.auth.password }}"
+  pass: {{ .Values.postgresql.auth.password | quote }}
 
   # Whether disable Caching queries
   #disableCache: true
@@ -150,7 +150,7 @@ redis:
   {{- else }}
   host: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }}
   {{- end }}
-  port: {{ .Values.redis.port | default "6379" | quote }}
+  port: {{ .Values.redis.port | default 6379 }}
   #family: 0  # 0=Both, 4=IPv4, 6=IPv6
   pass: {{ .Values.redis.auth.password | quote }}
   #prefix: example-prefix
@@ -217,8 +217,7 @@ id: 'aid'
 #maxCaptionLength: 1500
 
 # Reserved usernames that only the administrator can register with
-reservedUsernames:
+reservedUsernames: {{ .Values.iceshrimp.reservedUsernames | toJson }}
-{{ .Values.iceshrimp.reservedUsernames | toYaml }}
 
 # Whether disable HSTS
 #disableHsts: true
@@ -265,8 +264,7 @@ reservedUsernames:
 # Proxy remote files (default: false)
 #proxyRemoteFiles: true
 
-allowedPrivateNetworks:
+allowedPrivateNetworks: {{ .Values.iceshrimp.allowedPrivateNetworks | toJson }}
-{{ .Values.iceshrimp.allowedPrivateNetworks | toYaml }}
 
 # TWA
 #twa:

chart/templates/deployment.yaml

@@ -39,9 +39,9 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-            - pnpm
+            - yarn
             - run
-            - start
+            - migrateandstart
           env:
             - name: "NODE_ENV"
               value: "production"

chart/templates/job-db-migrate.yaml

@@ -36,9 +36,9 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-            - pnpm
+            - yarn
             - run
-            - migrate
+            - migrateandstart
           env:
             - name: "NODE_ENV"
               value: "production"