config seg aai resources and traversal
Issue-ID: OOM-658
Change-Id: I8878f202147edc419341fdc3bdafeb1ebc2eec1c
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
diff --git a/templates/aai-filebeat-configmap.yaml b/templates/aai-filebeat-configmap.yaml
new file mode 100644
index 0000000..5a123a5
--- /dev/null
+++ b/templates/aai-filebeat-configmap.yaml
@@ -0,0 +1,9 @@
+#{{ if not .Values.disableAaiAaiResources }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-filebeat-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml
index 7ff5e66..5ca0c16 100644
--- a/templates/aai-resources-deployment.yaml
+++ b/templates/aai-resources-deployment.yaml
@@ -50,7 +50,10 @@
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /var/chef/aai-data/
+ - 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: /var/log/onap
name: aai-resources-logs
@@ -69,6 +72,7 @@
imagePullPolicy: {{ .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
name: filebeat-conf
- mountPath: /var/log/onap
name: aai-resources-logs
@@ -78,12 +82,15 @@
- name: localtime
hostPath:
path: /etc/localtime
+ - name: aai-chef-config
+ configMap:
+ name: aai-chef-config-configmap
- name: aai-data
- hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+ configMap:
+ name: aai-resources-environments-configmap
- name: filebeat-conf
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ configMap:
+ name: aai-filebeat-configmap
- name: aai-resources-logs
emptyDir: {}
- name: aai-resources-filebeat
diff --git a/templates/aai-resources-traversal-configmap.yaml b/templates/aai-resources-traversal-configmap.yaml
new file mode 100644
index 0000000..772c3a7
--- /dev/null
+++ b/templates/aai-resources-traversal-configmap.yaml
@@ -0,0 +1,17 @@
+#{{ if not .Values.disableAaiAaiResources }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-chef-config-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-resources-environments-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml
index f659392..fda0055 100644
--- a/templates/aai-traversal-deployment.yaml
+++ b/templates/aai-traversal-deployment.yaml
@@ -52,7 +52,10 @@
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /var/chef/aai-data/
+ - 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: /var/log/onap
name: aai-traversal-logs
@@ -71,6 +74,7 @@
imagePullPolicy: {{ .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
name: filebeat-conf
- mountPath: /var/log/onap
name: aai-traversal-logs
@@ -80,12 +84,15 @@
- name: localtime
hostPath:
path: /etc/localtime
+ - name: aai-chef-config
+ configMap:
+ name: aai-chef-config-configmap
- name: aai-data
- hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+ configMap:
+ name: aai-resources-environments-configmap
- name: filebeat-conf
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ configMap:
+ name: aai-filebeat-configmap
- name: aai-traversal-logs
emptyDir: {}
- name: aai-traversal-filebeat