1c8a743c by Adam Heath

Add ability to specify a jdbc driver copy image.

1 parent 36f3e5db
...@@ -31,10 +31,26 @@ spec: ...@@ -31,10 +31,26 @@ spec:
31 securityContext: 31 securityContext:
32 {{- toYaml .Values.podSecurityContext | nindent 8 }} 32 {{- toYaml .Values.podSecurityContext | nindent 8 }}
33 volumes: 33 volumes:
34 - name: runtime-lib
35 emptyDir: {}
34 - name: disable-elasticsearch 36 - name: disable-elasticsearch
35 emptyDir: {} 37 emptyDir: {}
36 initContainers: 38 initContainers:
37 {{- if and (eq .Values.configMap.entity_ds_db_conf "postgres") (.Values.checkDsConnection.enabled) }} 39 {{- if (eq .Values.configMap.entity_ds_db_conf "postgres") }}
40 {{- if .Values.postgresql.jdbcImage.enabled }}
41 - name: postgresql-copy-jdbc
42 image: "{{ .Values.postgresql.jdbcImage.repository }}:{{ .Values.postgresql.jdbcImage.tag }}"
43 imagePullPolicy: {{ .Values.postgresql.jdbcImage.pullPolicy }}
44 command:
45 - bash
46 - -cx
47 - cp -a /usr/share/java/*.jar /tmp/runtime-lib
48 volumeMounts:
49 - mountPath: /tmp/runtime-lib
50 name: runtime-lib
51
52 {{- end }}
53 {{- if (.Values.checkDsConnection.enabled) }}
38 - name: postgresql-check-connection 54 - name: postgresql-check-connection
39 image: "{{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}" 55 image: "{{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}"
40 imagePullPolicy: {{ .Values.postgresql.image.pullPolicy }} 56 imagePullPolicy: {{ .Values.postgresql.image.pullPolicy }}
...@@ -52,6 +68,8 @@ spec: ...@@ -52,6 +68,8 @@ spec:
52 until pg_isready -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -p ${POSTGRES_PORT}; do 68 until pg_isready -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -p ${POSTGRES_PORT}; do
53 sleep 5 69 sleep 5
54 done 70 done
71
72 {{- end }}
55 {{- end }} 73 {{- end }}
56 74
57 {{- define "moqui-container-pod" }} 75 {{- define "moqui-container-pod" }}
...@@ -85,6 +103,8 @@ spec: ...@@ -85,6 +103,8 @@ spec:
85 - name: elasticsearch_url 103 - name: elasticsearch_url
86 value: {{ include "moqui.opensearch-url" . }} 104 value: {{ include "moqui.opensearch-url" . }}
87 volumeMounts: 105 volumeMounts:
106 - mountPath: /opt/moqui/runtime/lib
107 name: runtime-lib
88 - mountPath: /opt/moqui/runtime/elasticsearch 108 - mountPath: /opt/moqui/runtime/elasticsearch
89 name: disable-elasticsearch 109 name: disable-elasticsearch
90 {{- end }} 110 {{- end }}
......
...@@ -24,6 +24,11 @@ postgresql: ...@@ -24,6 +24,11 @@ postgresql:
24 database: moqui 24 database: moqui
25 username: moqui 25 username: moqui
26 password: iuqom 26 password: iuqom
27 jdbcImage:
28 enabled: false
29 pullPolicy: null
30 repository: null
31 tag: null
27 32
28 opensearch: 33 opensearch:
29 enabled: true 34 enabled: true
......