Merge branch 'develop'

self-hosters-by-night · Oct 14, 2024 · dff0eee · dff0eee
2 parents 94c9f16 + 0dc13d5
commit dff0eee
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/assets/postgres.png b/assets/postgres.png
diff --git a/charts/manyfold/Chart.yaml b/charts/manyfold/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: manyfold
-description: "Manyfold A self-hosted digital asset manager for 3d print files."
+description: "Manyfold is a self-hosted digital asset manager for 3d print files."
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: "0.78.1"
 icon: https://raw.githubusercontent.com/manyfold3d/manyfold/main/app/assets/images/roundel.svg
 annotations:

diff --git a/charts/manyfold/templates/deployment.yaml b/charts/manyfold/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
       labels:
         {{- include "manyfold.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
       {{- with .Values.nodeSelector }}
@@ -37,8 +37,10 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -61,10 +63,14 @@ spec:
             - secretRef:
               name: {{ .name }}
           {{- end }}
+          {{- with .Values.securityContext }}
           securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: manyfold-config
               mountPath: /config
@@ -88,6 +94,6 @@ spec:
         - name: manyfold-libraries
           persistentVolumeClaim:
             claimName: manyfold-libraries
-        {{- with .Values.volumes }}
+        {{- with .Values.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: postgres
 description: "Postgres is an object-relational database system that provides reliability and data integrity."
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: "16.4"
-icon: https://wiki.postgres.org/images/3/30/postgres_logo.3colors.120x120.png
+icon: https://raw.githubusercontent.com/self-hosters-by-night/helm-charts/refs/heads/main/assets/postgres.png
 annotations:
   artifacthub.io/category: database
 maintainers:

diff --git a/charts/postgres/templates/deployment.yaml b/charts/postgres/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
       {{- end }}
       {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}