Merge pull request #941 from redpanda-data/ae/connectors2

Connectors: merge lists to compose volumes and volumemounts properly.
redpanda-data · Dec 20, 2023 · 5d9a780 · 5d9a780
2 parents 47c5cc6 + a22566b
commit 5d9a780
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/charts/redpanda/Chart.yaml b/charts/redpanda/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 5.6.64
+version: 5.6.65
 
 # The app version is the default version of Redpanda to install.
 # ** NOTE for maintainers: please ensure the artifacthub image annotation is updated before merging

diff --git a/charts/redpanda/templates/connectors/connectors.yaml b/charts/redpanda/templates/connectors/connectors.yaml
@@ -50,12 +50,18 @@ limitations under the License.
   {{ $consoleSASLConfig = cat $consoleSASLConfig " echo $CONNECT_SASL_PASSWORD > /opt/kafka/connect-password/rc-credentials/password;" }}
   {{ $consoleSASLConfig = cat $consoleSASLConfig " exec /opt/kafka/bin/kafka_connect_run.sh" }}
   {{ $command = append $command $consoleSASLConfig }}
+
+  {{ $extraVolumes = concat $extraVolumes .Values.connectors.storage.volume }}
+
   {{ $extraVolumes = append $extraVolumes (dict
     "name" (printf "%s-users" (include "redpanda.fullname" .))
     "secret" (dict
       "secretName" .Values.auth.sasl.secretRef
     )
   )}}
+
+  {{ $extraVolumeMounts = concat $extraVolumeMounts .Values.connectors.storage.volumeMounts }}
+
   {{ $extraVolumeMounts = append $extraVolumeMounts (dict
     "name" (printf "%s-users" (include "redpanda.fullname" .))
     "mountPath" "/mnt/users"