summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-10-16 20:40:41 -0500
committerInstrumental <jonathan.gathman@att.com>2018-10-17 12:30:06 -0500
commit378109d989a227e0ed80792db32027ee612e995f (patch)
tree858a73482f558ba7fce3ded95cf5eedd0a548c23 /kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
parent56b24225b64d9ae2354d640405b61ea97234f7cf (diff)
Recommended AAF/OOM Changes
This incorporats Mike E's changes as well as recommended changes from Abandoned 70511 (merges from multiple machines got too hard.) Made Olaf recommended changes. Changed to non-SNAPSHOT in anticipation of LF releasing this morning Put Versions back to "2.1.5-SNAPSHOT" Brian F reminded me that GWu's scripts handle version changes for Envs. Issue-ID: AAF-557 Change-Id: I3e81a9c65df356d1d27b0d453e09c9ed3a81f803 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml')
-rw-r--r--kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml44
1 files changed, 23 insertions, 21 deletions
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
index 5125eb161e..cfafba7088 100644
--- a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
@@ -31,20 +31,27 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +73,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +103,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"