Allow imagePullPolicy to also be set(defaults to IfNotPresent).
Showing
3 changed files
with
22 additions
and
10 deletions
... | @@ -114,6 +114,7 @@ spec: | ... | @@ -114,6 +114,7 @@ spec: |
114 | initContainers: | 114 | initContainers: |
115 | - name: copy-jdbc-drivers | 115 | - name: copy-jdbc-drivers |
116 | image: moqui-jdbc-drivers:latest | 116 | image: moqui-jdbc-drivers:latest |
117 | imagePullPolicy: IfNotPresent | ||
117 | command: ["/scripts/copy-jdbc-drivers"] | 118 | command: ["/scripts/copy-jdbc-drivers"] |
118 | volumeMounts: | 119 | volumeMounts: |
119 | - name: scripts | 120 | - name: scripts |
... | @@ -124,6 +125,7 @@ spec: | ... | @@ -124,6 +125,7 @@ spec: |
124 | containers: | 125 | containers: |
125 | - name: moqui | 126 | - name: moqui |
126 | image: moqui-app:latest | 127 | image: moqui-app:latest |
128 | imagePullPolicy: IfNotPresent | ||
127 | resources: | 129 | resources: |
128 | limits: | 130 | limits: |
129 | memory: 1Gi | 131 | memory: 1Gi | ... | ... |
... | @@ -7,8 +7,12 @@ app: | ... | @@ -7,8 +7,12 @@ app: |
7 | requests: | 7 | requests: |
8 | memory: 1Gi | 8 | memory: 1Gi |
9 | images: | 9 | images: |
10 | moqui-app: localhost:31234/moqui-app:latest | 10 | moqui-app: |
11 | moqui-jdbc-drivers: localhost:31234/moqui-jdbc-drivers:latest | 11 | name: localhost:31234/moqui-app:latest |
12 | pullPolicy: Always | ||
13 | moqui-jdbc-drivers: | ||
14 | name: localhost:31234/moqui-jdbc-drivers:latest | ||
15 | pullPolicy: Always | ||
12 | storage: | 16 | storage: |
13 | log: | 17 | log: |
14 | requests: 10Gi | 18 | requests: 10Gi |
... | @@ -42,5 +46,7 @@ postgresql: | ... | @@ -42,5 +46,7 @@ postgresql: |
42 | size: 1Gi | 46 | size: 1Gi |
43 | version: "14" | 47 | version: "14" |
44 | images: | 48 | images: |
45 | wait-for-pg: registry.opensource.zalan.do/acid/spilo-14:2.1-p6 | 49 | wait-for-pg: |
50 | name: registry.opensource.zalan.do/acid/spilo-14:2.1-p6 | ||
51 | pullPolicy: IfNotPresent | ||
46 | 52 | ... | ... |
... | @@ -86,11 +86,6 @@ releases: | ... | @@ -86,11 +86,6 @@ releases: |
86 | namespace: {{ .Values.namespace }} | 86 | namespace: {{ .Values.namespace }} |
87 | values: | 87 | values: |
88 | - namePrefix: {{ .Values.name }}- | 88 | - namePrefix: {{ .Values.name }}- |
89 | images: | ||
90 | - name: moqui-app | ||
91 | newName: {{ .Values.app.images | get "moqui-app" }} | ||
92 | - name: moqui-jdbc-drivers | ||
93 | newName: {{ .Values.app.images | get "moqui-jdbc-drivers" }} | ||
94 | jsonPatches: | 89 | jsonPatches: |
95 | - target: | 90 | - target: |
96 | group: apps | 91 | group: apps |
... | @@ -111,7 +106,8 @@ releases: | ... | @@ -111,7 +106,8 @@ releases: |
111 | path: /spec/template/spec/initContainers/- | 106 | path: /spec/template/spec/initContainers/- |
112 | value: | 107 | value: |
113 | name: wait-for-pg | 108 | name: wait-for-pg |
114 | image: {{ .Values.postgresql.images | get "wait-for-pg" }} | 109 | image: {{ .Values.postgresql.images | get "wait-for-pg.name" }} |
110 | imagePullPolicy: {{ .Values.postgresql.images | get "wait-for-pg.pullPolicy" }} | ||
115 | command: ["/postgresql-scripts/pg_isready"] | 111 | command: ["/postgresql-scripts/pg_isready"] |
116 | volumeMounts: | 112 | volumeMounts: |
117 | - name: postgresql-scripts | 113 | - name: postgresql-scripts |
... | @@ -137,7 +133,8 @@ releases: | ... | @@ -137,7 +133,8 @@ releases: |
137 | path: /spec/template/spec/initContainers/- | 133 | path: /spec/template/spec/initContainers/- |
138 | value: | 134 | value: |
139 | name: wait-for-elasticsearch | 135 | name: wait-for-elasticsearch |
140 | image: {{ .Values.app.images | get "moqui-app" }} | 136 | image: {{ .Values.app.images | get "moqui-app.name" }} |
137 | imagePullPolicy: {{ .Values.app.images | get "moqui-app.pullPolicy" }} | ||
141 | command: ["/elasticsearch-scripts/es_isready"] | 138 | command: ["/elasticsearch-scripts/es_isready"] |
142 | volumeMounts: | 139 | volumeMounts: |
143 | - name: elasticsearch-scripts | 140 | - name: elasticsearch-scripts |
... | @@ -220,8 +217,15 @@ releases: | ... | @@ -220,8 +217,15 @@ releases: |
220 | runAsUser: 0 | 217 | runAsUser: 0 |
221 | runAsGroup: 0 | 218 | runAsGroup: 0 |
222 | 219 | ||
220 | initContainers: | ||
221 | - name: copy-jdbc-drivers | ||
222 | image: {{ .Values.app.images | get "moqui-jdbc-drivers.name" }} | ||
223 | imagePullPolicy: {{ .Values.app.images | get "moqui-jdbc-drivers.pullPolicy" }} | ||
224 | |||
223 | containers: | 225 | containers: |
224 | - name: moqui | 226 | - name: moqui |
227 | image: {{ .Values.app.images | get "moqui-app.name" }} | ||
228 | imagePullPolicy: {{ .Values.app.images | get "moqui-app.pullPolicy" }} | ||
225 | resources: {{ .Values.app.resources | toYaml | nindent 20 }} | 229 | resources: {{ .Values.app.resources | toYaml | nindent 20 }} |
226 | env: | 230 | env: |
227 | {{- if .Values.elasticsearch.enabled }} | 231 | {{- if .Values.elasticsearch.enabled }} | ... | ... |
-
Please register or sign in to post a comment