diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-10-16 20:40:41 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-10-17 12:30:06 -0500 |
| commit | e66cb59daf66a28f0dc0aa3999ba4b56fe1765a2 (patch) | |
| tree | 5eb548647e2fa17441e84183b1f51472a4e352cc /charts/aaf-gui | |
| parent | 7dc8906d761e2059c93b005e2eb52e48d6cb0434 (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 'charts/aaf-gui')
| -rw-r--r-- | charts/aaf-gui/templates/deployment.yaml | 44 | ||||
| -rw-r--r-- | charts/aaf-gui/values.yaml | 6 |
2 files changed, 27 insertions, 23 deletions
diff --git a/charts/aaf-gui/templates/deployment.yaml b/charts/aaf-gui/templates/deployment.yaml index 24c8e68..0342412 100644 --- a/charts/aaf-gui/templates/deployment.yaml +++ b/charts/aaf-gui/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" diff --git a/charts/aaf-gui/values.yaml b/charts/aaf-gui/values.yaml index 756bf2f..490fc7e 100644 --- a/charts/aaf-gui/values.yaml +++ b/charts/aaf-gui/values.yaml @@ -1,3 +1,4 @@ + # Copyright © 2017 Amdocs, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,7 +26,8 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_gui:2.1.4-SNAPSHOT +image: onap/aaf/aaf_gui:2.1.5-SNAPSHOT +aaf_register_as: "aaf-gui.onap" pullPolicy: Always @@ -77,4 +79,4 @@ resources: requests: cpu: 100m memory: 500Mi - unlimited: {}
\ No newline at end of file + unlimited: {} |