summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
9a19489)
Sets conditions on volumes that are not mounted when AAF is disabled.
Issue-ID: OOM-2887
Signed-off-by: othman touijer <othman.touijer@soprasteria.com>
Change-Id: If5613bf22d3dbfe527be77726cb1b14a538a2e04
- name: config
configMap:
name: {{ include "common.fullname" . }}
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
+ {{- if .Values.global.aafEnabled }}
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: {{ .Values.restartPolicy }}
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
restartPolicy: {{ .Values.restartPolicy }}
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
- name: config
configMap:
name: {{ include "common.fullname" . }}
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
+ {{- if .Values.global.aafEnabled }}
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
- name: migration
configMap:
name: {{ include "common.fullname" . }}-migration
- name: migration
configMap:
name: {{ include "common.fullname" . }}-migration
- -c
- |
bash docker-entrypoint.sh createDBSchema.sh
- -c
- |
bash docker-entrypoint.sh createDBSchema.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
- name: config
configMap:
name: {{ include "common.fullname" . }}
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
+ {{- if .Values.global.aafEnabled }}
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: Never
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
restartPolicy: Never
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
- -c
- |
bash docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ;
- -c
- |
bash docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ;
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
- name: {{ include "common.fullname" . }}-snapshots
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}-migration
- name: {{ include "common.fullname" . }}-snapshots
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}-migration
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
+ {{- if .Values.global.aafEnabled }}
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: Never
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Never
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
- name: localtime
hostPath:
path: /etc/localtime
- name: localtime
hostPath:
path: /etc/localtime
- - name: prop-config-input
- configMap:
- name: {{ include "common.fullname" . }}-prop
+ {{- if .Values.global.aafEnabled }}
+ - name: prop-config-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-prop
- name: auth-config
secret:
secretName: {{ include "common.fullname" . }}
- name: auth-config
secret:
secretName: {{ include "common.fullname" . }}
configMap:
name: {{ include "common.fullname" . }}
- name: portal-config
configMap:
name: {{ include "common.fullname" . }}
- name: portal-config
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
- name: portal-config-input
emptyDir:
medium: Memory
- name: portal-config-input
configMap:
name: {{ include "common.fullname" . }}-portal
- name: portal-config-props
configMap:
name: {{ include "common.fullname" . }}-portal
- name: portal-config-props
{{- else }}
until nc -w10 -z -v aai.{{.Release.Namespace}} 80; do echo "Retrying to reach aai on port 80"; done;
bash -x /opt/app/aai-traversal/docker-entrypoint.sh install/updateQueryData.sh ;
{{- else }}
until nc -w10 -z -v aai.{{.Release.Namespace}} 80; do echo "Retrying to reach aai on port 80"; done;
bash -x /opt/app/aai-traversal/docker-entrypoint.sh install/updateQueryData.sh ;
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
{{- end }}
env:
- name: LOCAL_USER_ID
{{- end }}
env:
- name: LOCAL_USER_ID