1f59c12f by Adam Heath

Allow imagePullPolicy to also be set(defaults to IfNotPresent).

1 parent b5a654c8
......@@ -114,6 +114,7 @@ spec:
initContainers:
- name: copy-jdbc-drivers
image: moqui-jdbc-drivers:latest
imagePullPolicy: IfNotPresent
command: ["/scripts/copy-jdbc-drivers"]
volumeMounts:
- name: scripts
......@@ -124,6 +125,7 @@ spec:
containers:
- name: moqui
image: moqui-app:latest
imagePullPolicy: IfNotPresent
resources:
limits:
memory: 1Gi
......
......@@ -7,8 +7,12 @@ app:
requests:
memory: 1Gi
images:
moqui-app: localhost:31234/moqui-app:latest
moqui-jdbc-drivers: localhost:31234/moqui-jdbc-drivers:latest
moqui-app:
name: localhost:31234/moqui-app:latest
pullPolicy: Always
moqui-jdbc-drivers:
name: localhost:31234/moqui-jdbc-drivers:latest
pullPolicy: Always
storage:
log:
requests: 10Gi
......@@ -42,5 +46,7 @@ postgresql:
size: 1Gi
version: "14"
images:
wait-for-pg: registry.opensource.zalan.do/acid/spilo-14:2.1-p6
wait-for-pg:
name: registry.opensource.zalan.do/acid/spilo-14:2.1-p6
pullPolicy: IfNotPresent
......
......@@ -86,11 +86,6 @@ releases:
namespace: {{ .Values.namespace }}
values:
- namePrefix: {{ .Values.name }}-
images:
- name: moqui-app
newName: {{ .Values.app.images | get "moqui-app" }}
- name: moqui-jdbc-drivers
newName: {{ .Values.app.images | get "moqui-jdbc-drivers" }}
jsonPatches:
- target:
group: apps
......@@ -111,7 +106,8 @@ releases:
path: /spec/template/spec/initContainers/-
value:
name: wait-for-pg
image: {{ .Values.postgresql.images | get "wait-for-pg" }}
image: {{ .Values.postgresql.images | get "wait-for-pg.name" }}
imagePullPolicy: {{ .Values.postgresql.images | get "wait-for-pg.pullPolicy" }}
command: ["/postgresql-scripts/pg_isready"]
volumeMounts:
- name: postgresql-scripts
......@@ -137,7 +133,8 @@ releases:
path: /spec/template/spec/initContainers/-
value:
name: wait-for-elasticsearch
image: {{ .Values.app.images | get "moqui-app" }}
image: {{ .Values.app.images | get "moqui-app.name" }}
imagePullPolicy: {{ .Values.app.images | get "moqui-app.pullPolicy" }}
command: ["/elasticsearch-scripts/es_isready"]
volumeMounts:
- name: elasticsearch-scripts
......@@ -220,8 +217,15 @@ releases:
runAsUser: 0
runAsGroup: 0
initContainers:
- name: copy-jdbc-drivers
image: {{ .Values.app.images | get "moqui-jdbc-drivers.name" }}
imagePullPolicy: {{ .Values.app.images | get "moqui-jdbc-drivers.pullPolicy" }}
containers:
- name: moqui
image: {{ .Values.app.images | get "moqui-app.name" }}
imagePullPolicy: {{ .Values.app.images | get "moqui-app.pullPolicy" }}
resources: {{ .Values.app.resources | toYaml | nindent 20 }}
env:
{{- if .Values.elasticsearch.enabled }}
......