Skip to content

moqui / k8s-moqui

Go to a project
Toggle navigation
Toggle navigation pinning
b5a654c8 by Adam Heath
Options

Allow all the container images to be specified.

1 parent ca0eeef1
Inline Side-by-side
Showing 2 changed files with 9 additions and 6 deletions
...@@ -6,6 +6,9 @@ app: ...@@ -6,6 +6,9 @@ app:
6 memory: 1Gi 6 memory: 1Gi
7 requests: 7 requests:
8 memory: 1Gi 8 memory: 1Gi
9 images:
10 moqui-app: localhost:31234/moqui-app:latest
11 moqui-jdbc-drivers: localhost:31234/moqui-jdbc-drivers:latest
9 storage: 12 storage:
10 log: 13 log:
11 requests: 10Gi 14 requests: 10Gi
...@@ -38,4 +41,6 @@ postgresql: ...@@ -38,4 +41,6 @@ postgresql:
38 volume: 41 volume:
39 size: 1Gi 42 size: 1Gi
40 version: "14" 43 version: "14"
44 images:
45 wait-for-pg: registry.opensource.zalan.do/acid/spilo-14:2.1-p6
41 46
......
...@@ -88,11 +88,9 @@ releases: ...@@ -88,11 +88,9 @@ releases:
88 - namePrefix: {{ .Values.name }}- 88 - namePrefix: {{ .Values.name }}-
89 images: 89 images:
90 - name: moqui-app 90 - name: moqui-app
91 newName: localhost:31234/moqui-app 91 newName: {{ .Values.app.images | get "moqui-app" }}
92 newTag: test-latest
93 - name: moqui-jdbc-drivers 92 - name: moqui-jdbc-drivers
94 newName: localhost:31234/moqui-jdbc-drivers 93 newName: {{ .Values.app.images | get "moqui-jdbc-drivers" }}
95 newTag: test-latest
96 jsonPatches: 94 jsonPatches:
97 - target: 95 - target:
98 group: apps 96 group: apps
...@@ -113,7 +111,7 @@ releases: ...@@ -113,7 +111,7 @@ releases:
113 path: /spec/template/spec/initContainers/- 111 path: /spec/template/spec/initContainers/-
114 value: 112 value:
115 name: wait-for-pg 113 name: wait-for-pg
116 image: registry.opensource.zalan.do/acid/spilo-14:2.1-p6 114 image: {{ .Values.postgresql.images | get "wait-for-pg" }}
117 command: ["/postgresql-scripts/pg_isready"] 115 command: ["/postgresql-scripts/pg_isready"]
118 volumeMounts: 116 volumeMounts:
119 - name: postgresql-scripts 117 - name: postgresql-scripts
...@@ -139,7 +137,7 @@ releases: ...@@ -139,7 +137,7 @@ releases:
139 path: /spec/template/spec/initContainers/- 137 path: /spec/template/spec/initContainers/-
140 value: 138 value:
141 name: wait-for-elasticsearch 139 name: wait-for-elasticsearch
142 image: localhost:31234/moqui-app:test-latest 140 image: {{ .Values.app.images | get "moqui-app" }}
143 command: ["/elasticsearch-scripts/es_isready"] 141 command: ["/elasticsearch-scripts/es_isready"]
144 volumeMounts: 142 volumeMounts:
145 - name: elasticsearch-scripts 143 - name: elasticsearch-scripts
......