fix: 修正values节点格式

helm-chart/templates/adapter-statefulset.yaml

@@ -27,7 +27,10 @@ spec:
             - containerPort: 8095
               name: napcat-ws
               protocol: TCP
-          resources: {{ .Values.adapter.resources | default nil }}
+          {{- if .Values.adapter.resources }}
+          resources:
+            {{ toYaml .Values.adapter.resources | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - mountPath: /adapters/data
               name: data
@@ -35,9 +38,18 @@ spec:
               name: config
               readOnly: true
               subPath: config.toml
-      imagePullSecrets: {{ .Values.adapter.image.pullSecrets | default nil }}
+      {{- if .Values.adapter.image.pullSecrets }}
-      nodeSelector: {{ .Values.adapter.nodeSelector | default nil }}
+      imagePullSecrets:
-      tolerations: {{ .Values.adapter.tolerations | default nil }}
+        {{ toYaml .Values.adapter.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.adapter.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.adapter.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.adapter.tolerations }}
+      tolerations:
+        {{ toYaml .Values.adapter.tolerations | nindent 8 }}
+      {{- end }}
       volumes:
         - name: data
           persistentVolumeClaim:

helm-chart/templates/core-statefulset.yaml

@@ -35,7 +35,10 @@ spec:
             - containerPort: 8000
               name: adapter-ws
               protocol: TCP
-          resources: {{ .Values.core.resources | default nil }}
+          {{- if .Values.core.resources }}
+          resources:
+            {{ toYaml .Values.core.resources | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - mountPath: /MaiMBot/data
               name: data
@@ -59,9 +62,18 @@ spec:
             - mountPath: /MaiMBot/statistics
               name: statistics
             {{- end }}
-      imagePullSecrets: {{ .Values.core.image.pullSecrets | default nil }}
+      {{- if .Values.core.image.pullSecrets }}
-      nodeSelector: {{ .Values.core.nodeSelector | default nil }}
+      imagePullSecrets:
-      tolerations: {{ .Values.core.tolerations | default nil }}
+        {{ toYaml .Values.core.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.core.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.core.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.core.tolerations }}
+      tolerations:
+        {{ toYaml .Values.core.tolerations | nindent 8 }}
+      {{- end }}
       volumes:
         - name: data
           persistentVolumeClaim:

helm-chart/templates/napcat-ingress.yaml

@@ -4,7 +4,10 @@ kind: Ingress
 metadata:
   name: {{ .Release.Name }}-maibot-napcat
   namespace: {{ .Release.Namespace }}
-  annotations: {{ .Values.napcat.ingress.annotations | default nil }}
+  {{- if .Values.napcat.ingress.annotations }}
+  annotations:
+    {{ toYaml .Values.napcat.ingress.annotations | nindent 4 }}
+  {{- end }}
   labels:
     app: {{ .Release.Name }}-maibot-napcat
 spec:

helm-chart/templates/napcat-statefulset.yaml

@@ -42,7 +42,10 @@ spec:
             - containerPort: 6099
               name: webui
               protocol: TCP
-          resources: {{ .Values.napcat.resources | default nil }}
+          {{- if .Values.napcat.resources }}
+          resources:
+            {{ toYaml .Values.napcat.resources | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - mountPath: /app/napcat/config
               name: napcat
@@ -50,9 +53,18 @@ spec:
             - mountPath: /app/.config/QQ
               name: napcat
               subPath: data
-      imagePullSecrets: {{ .Values.napcat.image.pullSecrets | default nil }}
+      {{- if .Values.napcat.image.pullSecrets }}
-      nodeSelector: {{ .Values.napcat.nodeSelector | default nil }}
+      imagePullSecrets:
-      tolerations: {{ .Values.napcat.tolerations | default nil }}
+        {{ toYaml .Values.napcat.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.napcat.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.napcat.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.napcat.tolerations }}
+      tolerations:
+        {{ toYaml .Values.napcat.tolerations | nindent 8 }}
+      {{- end }}
       volumes:
         - name: napcat
           persistentVolumeClaim:

helm-chart/templates/sqlite-web-ingress.yaml

@@ -4,7 +4,10 @@ kind: Ingress
 metadata:
   name: {{ .Release.Name }}-maibot-sqlite-web
   namespace: {{ .Release.Namespace }}
-  annotations: {{ .Values.sqlite_web.ingress.annotations | default nil }}
+  {{- if .Values.sqlite_web.ingress.annotations }}
+  annotations:
+    {{ toYaml .Values.sqlite_web.ingress.annotations | nindent 4 }}
+  {{- end }}
   labels:
     app: {{ .Release.Name }}-maibot-sqlite-web
 spec:

helm-chart/templates/sqlite-web-statefulset.yaml

@@ -38,13 +38,25 @@ spec:
             - containerPort: 8080
               name: webui
               protocol: TCP
-          resources: {{ .Values.sqlite_web.resources | default nil }}
+          {{- if .Values.sqlite_web.resources }}
+          resources:
+            {{ toYaml .Values.sqlite_web.resources | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - mountPath: /data/MaiMBot
               name: data
-      imagePullSecrets: {{ .Values.sqlite_web.image.pullSecrets | default nil }}
+      {{- if .Values.sqlite_web.image.pullSecrets }}
-      nodeSelector: {{ .Values.sqlite_web.nodeSelector | default nil }}
+      imagePullSecrets:
-      tolerations: {{ .Values.sqlite_web.tolerations | default nil }}
+        {{ toYaml .Values.sqlite_web.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.sqlite_web.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.sqlite_web.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.sqlite_web.tolerations }}
+      tolerations:
+        {{ toYaml .Values.sqlite_web.tolerations | nindent 8 }}
+      {{- end }}
       volumes:
         - name: data
           persistentVolumeClaim:

helm-chart/templates/statistics-deployment.yaml

@@ -34,14 +34,26 @@ spec:
             - containerPort: 80
               name: dashboard
               protocol: TCP
-          resources: {{ .Values.statistics_dashboard.resources | default nil }}
+          {{- if .Values.statistics_dashboard.resources }}
+          resources:
+            {{ toYaml .Values.statistics_dashboard.resources | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - mountPath: /usr/share/nginx/html
               name: statistics
               readOnly: true
-      imagePullSecrets: {{ .Values.statistics_dashboard.image.pullSecrets | default nil }}
+      {{- if .Values.statistics_dashboard.image.pullSecrets }}
-      nodeSelector: {{ .Values.statistics_dashboard.nodeSelector | default nil }}
+      imagePullSecrets:
-      tolerations: {{ .Values.core.tolerations | default nil }}
+        {{ toYaml .Values.statistics_dashboard.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.statistics_dashboard.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.statistics_dashboard.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.statistics_dashboard.tolerations }}
+      tolerations:
+        {{ toYaml .Values.statistics_dashboard.tolerations | nindent 8 }}
+      {{- end }}
       volumes:
         - name: statistics
           persistentVolumeClaim:

helm-chart/templates/statistics-ingress.yaml

@@ -4,7 +4,10 @@ kind: Ingress
 metadata:
   name: {{ .Release.Name }}-maibot-statistics-dashboard
   namespace: {{ .Release.Namespace }}
-  annotations: {{ .Values.statistics_dashboard.ingress.annotations | default nil }}
+  {{- if .Values.statistics_dashboard.ingress.annotations }}
+  annotations:
+    {{ toYaml .Values.statistics_dashboard.ingress.annotations | nindent 4 }}
+  {{- end }}
   labels:
     app: {{ .Release.Name }}-maibot-statistics-dashboard
 spec: