Merge branch 'develop'

self-hosters-by-night · Oct 9, 2024 · 20b8d3c · 20b8d3c
2 parents 5e56107 + e9cd7f8
commit 20b8d3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 35 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.2.0
+version: 0.3.0
 appVersion: "1.2.0"
 icon: https://raw.githubusercontent.com/warpstreamlabs/bento/main/icon.png
 annotations:

diff --git a/charts/bento/templates/deployment.yaml b/charts/bento/templates/deployment.yaml
@@ -28,34 +28,22 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "bento.serviceAccountName" . }}
-      {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.env }}
       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.env }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- end }}
-          {{- with .Values.env }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- end }}
           {{- with .Values.env }}
           env:
             {{- toYaml . | nindent 12 }}
@@ -76,12 +64,8 @@ spec:
               mountPath: /bento.yaml
               subPath: bento.yaml
               readOnly: true
-            {{- range .Values.extraVolumeMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              {{- if .subPath }}
-              subPath: {{ .subPath }}
-              {{- end }}
+            {{- with .Values.extraVolumes }}
+              {{- toYaml . | nindent 12 }}
             {{- end }}
           ports:
             {{- range .Values.service.ports }}
@@ -97,20 +81,6 @@ spec:
         - name: bento-config
           configMap:
             name: {{ .Release.Name }}
-        {{- range .Values.extraVolumes }}
-        - name: {{ .name }}
-          {{- if eq .type "configMap" }}
-          configMap:
-            name: {{ .configMap.name }}
-            {{- if .configMap.items }}
-            items:
-              {{- range .configMap.items }}
-              - key: {{ .key }}
-                path: {{ .path }}
-              {{- end }}
-            {{- end }}
-          {{- else if eq .type "secret" }}
-          secret:
-            secretName: {{ .secret.secretName }}
-          {{- end }}
+        {{- with .Values.extraVolumes }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}