diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-11-28 13:28:35 +0100 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2019-11-28 14:13:51 +0100 |
commit | 18747ec29947084c571d66f37f1a0fe85fbe4702 (patch) | |
tree | 81636bf9ee7d3f739858aa4c8016901abdade19e /components/aai-elasticsearch/templates/deployment.yaml | |
parent | 81954e51ef4c04fb08182d779f4871dfca766221 (diff) |
Use global storage templates for PVC
OOM has now templates in order to create the needed PVC, using:
* a PV with a specific class when using a common nfs mount path between
nodes (sames as today use) --> is the default behavior today
* or a storage class if we want to use dynamic PV.
On this case, we use (in order of priority):
- persistence.storageClassOverride if set on the chart
- global.persistence.storageClass if set globally
- persistence.storageClass if set on the chart
I've also created a PV/PVC for elasticsearch has it was hardcoded to
hostPath.
I've also removed hostPath for job logs (aai-traversal logs were not put
into the desired hostPath)
And I moved the 3 jobs of aai-graphadmin into 3 files as it's a better
practice (several object in the same file can lead to unexpected
behavior).
Behavior is supposed to be exactly the same as before.
Issue-ID: OOM-1227
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I71c6cee8d7c33ef7bd39c40a43c26b377d4ceec3
Diffstat (limited to 'components/aai-elasticsearch/templates/deployment.yaml')
-rw-r--r-- | components/aai-elasticsearch/templates/deployment.yaml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/aai-elasticsearch/templates/deployment.yaml b/components/aai-elasticsearch/templates/deployment.yaml index 0c54738..3b8141c 100644 --- a/components/aai-elasticsearch/templates/deployment.yaml +++ b/components/aai-elasticsearch/templates/deployment.yaml @@ -60,7 +60,7 @@ spec: - name: elasticsearch-data mountPath: /logroot/ containers: - - name: {{ include "common.name" . }} + - name: {{ include "common.name" . }} image: "{{ .Values.global.loggingRepository }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }} ports: @@ -105,7 +105,6 @@ spec: affinity: {{ toYaml .Values.affinity | indent 8 }} {{- end }} - volumes: - name: localtime hostPath: @@ -114,8 +113,8 @@ spec: configMap: name: {{ include "common.fullname" . }}-es-config - name: elasticsearch-data - hostPath: - path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }}-data restartPolicy: {{ .Values.restartPolicy }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |