b5a654c8 by Adam Heath

Allow all the container images to be specified.

1 parent ca0eeef1
......@@ -6,6 +6,9 @@ app:
memory: 1Gi
requests:
memory: 1Gi
images:
moqui-app: localhost:31234/moqui-app:latest
moqui-jdbc-drivers: localhost:31234/moqui-jdbc-drivers:latest
storage:
log:
requests: 10Gi
......@@ -38,4 +41,6 @@ postgresql:
volume:
size: 1Gi
version: "14"
images:
wait-for-pg: registry.opensource.zalan.do/acid/spilo-14:2.1-p6
......
......@@ -88,11 +88,9 @@ releases:
- namePrefix: {{ .Values.name }}-
images:
- name: moqui-app
newName: localhost:31234/moqui-app
newTag: test-latest
newName: {{ .Values.app.images | get "moqui-app" }}
- name: moqui-jdbc-drivers
newName: localhost:31234/moqui-jdbc-drivers
newTag: test-latest
newName: {{ .Values.app.images | get "moqui-jdbc-drivers" }}
jsonPatches:
- target:
group: apps
......@@ -113,7 +111,7 @@ releases:
path: /spec/template/spec/initContainers/-
value:
name: wait-for-pg
image: registry.opensource.zalan.do/acid/spilo-14:2.1-p6
image: {{ .Values.postgresql.images | get "wait-for-pg" }}
command: ["/postgresql-scripts/pg_isready"]
volumeMounts:
- name: postgresql-scripts
......@@ -139,7 +137,7 @@ releases:
path: /spec/template/spec/initContainers/-
value:
name: wait-for-elasticsearch
image: localhost:31234/moqui-app:test-latest
image: {{ .Values.app.images | get "moqui-app" }}
command: ["/elasticsearch-scripts/es_isready"]
volumeMounts:
- name: elasticsearch-scripts
......