Merge branch 'develop'

self-hosters-by-night · Oct 12, 2024 · 6766530 · 6766530
2 parents 32c6f46 + cb89265
commit 6766530
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 17 deletions.
diff --git a/charts/bento/Chart.yaml b/charts/bento/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bento
 description: "Bento is a declarative data streaming service that solves a wide range of data engineering problems with simple, chained, stateless processing steps. It implements transaction based resiliency with back pressure, so when connecting to at-least-once sources and sinks it's able to guarantee at-least-once delivery without needing to persist messages during transit."
 type: application
-version: 0.4.1
+version: 0.5.1
 appVersion: "1.2.0"
 icon: https://raw.githubusercontent.com/warpstreamlabs/bento/main/icon.png
 annotations:

diff --git a/charts/bento/templates/configmap.yml → charts/bento/templates/configmap.yaml b/charts/bento/templates/configmap.yml → charts/bento/templates/configmap.yaml
diff --git a/charts/bento/templates/deployment.yaml b/charts/bento/templates/deployment.yaml
@@ -20,7 +20,7 @@ spec:
       labels:
         {{- include "bento.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/bento/templates/service.yaml b/charts/bento/templates/service.yaml
@@ -10,7 +10,7 @@ spec:
     {{- range .Values.service.ports }}
     - name: {{ .name }}
       port: {{ .port }}
-      targetPort: {{ .targetPort | default .port }}
+      targetPort: {{ .targetPort | default .name }}
       protocol: {{ .protocol | default "TCP" }}
     {{- end }}
   selector:

diff --git a/charts/bento/values.yaml b/charts/bento/values.yaml
@@ -1,5 +1,4 @@
-global:
-  imagePullSecrets: []
+imagePullSecrets: []
 
 serviceAccount:
   # Specifies whether a service account should be created

diff --git a/charts/manyfold/Chart.yaml b/charts/manyfold/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: manyfold
 description: "Manyfold A self-hosted digital asset manager for 3d print files."
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "0.78.1"
 icon: https://raw.githubusercontent.com/manyfold3d/manyfold/main/app/assets/images/roundel.svg
 annotations:

diff --git a/charts/manyfold/templates/service.yaml b/charts/manyfold/templates/service.yaml
@@ -12,4 +12,4 @@ spec:
     - name: http
       port: {{ .Values.service.port }}
       protocol: TCP
-      targetPort: 3214
+      targetPort: http
diff --git a/charts/postgres/templates/deployment.yaml b/charts/postgres/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
       labels:
         {{- include "postgres.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
@@ -37,18 +37,27 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+          {{- end }}
+          {{- with .Values.resources }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- with .Values.env }}
           env:
             {{- toYaml .Values.env | nindent 12 }}
+          {{- end }}
+          {{- if or .Values.configMapRefs .Values.secretRefs }}
           envFrom:
             {{- range .Values.configMapRefs }}
             - configMapRef:
@@ -58,6 +67,7 @@ spec:
             - secretRef:
                 name: {{ .name }}
             {{- end }}
+          {{- end }}
           ports:
             - name: postgres
               containerPort: 5432
@@ -66,11 +76,20 @@ spec:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
-          {{- with .Values.volumeMounts }}
           volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.volumes }}
+            - name: data
+              mountPath: /var/lib/postgresql/data
+            {{- with .Values.extraVolumeMounts }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
       volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        - name: data
+        {{- if .Values.persistence.data.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.persistence.data.existingClaim }}
+        {{- else }}
+          emptyDir: {}
+        {{- end }}
+        {{- with .Values.extraVolumes }}
+            {{- toYaml . | nindent 8 }}
+        {{- end }}
diff --git a/charts/postgres/templates/service.yaml b/charts/postgres/templates/service.yaml
@@ -12,4 +12,4 @@ spec:
     - name: postgres
       port: {{ .Values.service.port }}
       protocol: TCP
-      targetPort: 5432
+      targetPort: postgres
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
@@ -82,15 +82,20 @@ readinessProbe:
   initialDelaySeconds: 5
   periodSeconds: 10
 
+persistence:
+  data:
+    enabled: false
+    existingClaim: ""
+
 # Additional volumes on the output Deployment definition.
-volumes: []
+extraVolumes: []
 # - name: foo
 #   secret:
 #     secretName: mysecret
 #     optional: false
 
 # Additional volumeMounts on the output Deployment definition.
-volumeMounts: []
+extraVolumeMounts: []
 # - name: foo
 #   mountPath: "/etc/foo"
 #   readOnly: true