summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
diff options
context:
space:
mode:
authorvagrant <vagrant@aai.onap.org>2018-03-10 23:56:32 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2018-04-18 00:05:32 +0000
commit1a3a3557a080ba7ee7d1022d9a3dd0e165779ab2 (patch)
treedb48654f696136ee8f1ca5944befb98e3c94de1c /kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
parent88b15e05a15b70bfbb934111e5572193a45adbb8 (diff)
Update from using hbase to using cassandra
Also update resources and traversal to remove chef MK: Addressing the -1 statefulset comment Issue-ID: AAI-33 Change-Id: Ieee819703764fdda727f17d4e9be43084886828c Signed-off-by: Kajur, Harish vk250x@att.com <vk250x@att.com> Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/aai/charts/aai-traversal/templates/deployment.yaml')
-rw-r--r--kubernetes/aai/charts/aai-traversal/templates/deployment.yaml88
1 files changed, 56 insertions, 32 deletions
diff --git a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
index b4249aede1..bda80a0483 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
@@ -245,11 +245,14 @@ spec:
}
]'
spec:
+ hostname: aai-traversal
initContainers:
- command:
- /root/ready.py
args:
- --container-name
+ - aai-cassandra
+ - --container-name
- aai-resources
env:
- name: NAMESPACE
@@ -265,32 +268,39 @@ spec:
image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- - name: CHEF_BRANCH
- value: master
- - name: AAI_CHEF_ENV
- value: simpledemo
- - name: AAI_CORE_VERSION
- value: {{ .Values.config.aaicoreversion }}
- - name: AAI_CHEF_LOC
- value: /var/chef/aai-data/environments
- - name: CHEF_GIT_URL
- value: http://gerrit.onap.org/r/aai
- - name: RESOURCES_HOSTNAME
- value: aai-resources.{{ include "common.namespace" . }}
+ - name: DISABLE_UPDATE_QUERY
+ value: {{ .Values.config.disableUpdateQuery | quote }}
+ - name: LOCAL_USER_ID
+ value: {{ .Values.config.userId | quote }}
+ - name: LOCAL_GROUP_ID
+ value: {{ .Values.config.groupId | quote }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /var/chef/aai-data/chef-config/dev/.knife/solo.rb
- subPath: solo.rb
- name: aai-chef-config
- - mountPath: /var/chef/aai-data/environments/
- name: aai-data
+ - mountPath: /opt/app/aai-traversal/resources/etc/appprops/janusgraph-realtime.properties
+ name: {{ include "common.fullname" . }}-db-real-conf
+ subPath: janusgraph-realtime.properties
+ - mountPath: /opt/app/aai-traversal/resources/etc/appprops/janusgraph-cached.properties
+ name: {{ include "common.fullname" . }}-db-cached-conf
+ subPath: janusgraph-cached.properties
+ - mountPath: /opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
+ name: {{ include "common.fullname" . }}-aaiconfig-conf
+ subPath: aaiconfig.properties
- mountPath: /var/log/onap
- name: aai-traversal-logs
- - mountPath: /opt/app/aai-traversal/bundleconfig/etc/logback.xml
- name: aai-traversal-log-conf
+ name: {{ include "common.fullname" . }}-logs
+ - mountPath: /opt/app/aai-traversal/resources/logback.xml
+ name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
+ - mountPath: /opt/app/aai-traversal/resources/localhost-access-logback.xml
+ name: {{ include "common.fullname" . }}-localhost-access-log-conf
+ subPath: localhost-access-logback.xml
+ - mountPath: /opt/app/aai-traversal/resources/application.properties
+ name: {{ include "common.fullname" . }}-springapp-conf
+ subPath: application.properties
+ - mountPath: /opt/app/aai-traversal/resources/etc/auth/aai_keystore
+ name: {{ include "common.fullname" . }}-auth-sec
+ subPath: aai_keystore
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
@@ -328,30 +338,44 @@ spec:
subPath: filebeat.yml
name: filebeat-conf
- mountPath: /var/log/onap
- name: aai-traversal-logs
+ name: {{ include "common.fullname" . }}-logs
- mountPath: /usr/share/filebeat/data
- name: aai-traversal-filebeat
-
+ name: {{ include "common.fullname" . }}-filebeat
volumes:
- name: localtime
hostPath:
path: /etc/localtime
- - name: aai-chef-config
- configMap:
- name: aai-chef-config
- - name: aai-data
- configMap:
- name: aai-resources-environments
- name: filebeat-conf
configMap:
name: aai-filebeat
- - name: aai-traversal-logs
+ - name: {{ include "common.fullname" . }}-logs
emptyDir: {}
- - name: aai-traversal-filebeat
+ - name: {{ include "common.fullname" . }}-filebeat
emptyDir: {}
- - name: aai-traversal-log-conf
+ - name: {{ include "common.fullname" . }}-log-conf
configMap:
name: {{ include "common.fullname" . }}-log
+ - name: {{ include "common.fullname" . }}-localhost-access-log-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-localhost-access-log-configmap
+ - name: {{ include "common.fullname" . }}-db-real-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-db-real-configmap
+ - name: {{ include "common.fullname" . }}-db-cached-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-db-cached-configmap
+ - name: {{ include "common.fullname" . }}-aaiconfig-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-aaiconfig-configmap
+ - name: {{ include "common.fullname" . }}-springapp-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-springapp-configmap
+ - name: {{ include "common.fullname" . }}-realm-conf
+ configMap:
+ name: {{ include "common.fullname" . }}-realm-configmap
+ - name: {{ include "common.fullname" . }}-auth-sec
+ secret:
+ secretName: {{ include "common.fullname" . }}-auth-secret
restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"