1c8a743c by Adam Heath

Add ability to specify a jdbc driver copy image.

1 parent 36f3e5db
......@@ -31,10 +31,26 @@ spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
volumes:
- name: runtime-lib
emptyDir: {}
- name: disable-elasticsearch
emptyDir: {}
initContainers:
{{- if and (eq .Values.configMap.entity_ds_db_conf "postgres") (.Values.checkDsConnection.enabled) }}
{{- if (eq .Values.configMap.entity_ds_db_conf "postgres") }}
{{- if .Values.postgresql.jdbcImage.enabled }}
- name: postgresql-copy-jdbc
image: "{{ .Values.postgresql.jdbcImage.repository }}:{{ .Values.postgresql.jdbcImage.tag }}"
imagePullPolicy: {{ .Values.postgresql.jdbcImage.pullPolicy }}
command:
- bash
- -cx
- cp -a /usr/share/java/*.jar /tmp/runtime-lib
volumeMounts:
- mountPath: /tmp/runtime-lib
name: runtime-lib
{{- end }}
{{- if (.Values.checkDsConnection.enabled) }}
- name: postgresql-check-connection
image: "{{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}"
imagePullPolicy: {{ .Values.postgresql.image.pullPolicy }}
......@@ -52,6 +68,8 @@ spec:
until pg_isready -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -p ${POSTGRES_PORT}; do
sleep 5
done
{{- end }}
{{- end }}
{{- define "moqui-container-pod" }}
......@@ -85,6 +103,8 @@ spec:
- name: elasticsearch_url
value: {{ include "moqui.opensearch-url" . }}
volumeMounts:
- mountPath: /opt/moqui/runtime/lib
name: runtime-lib
- mountPath: /opt/moqui/runtime/elasticsearch
name: disable-elasticsearch
{{- end }}
......
......@@ -24,6 +24,11 @@ postgresql:
database: moqui
username: moqui
password: iuqom
jdbcImage:
enabled: false
pullPolicy: null
repository: null
tag: null
opensearch:
enabled: true
......