Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "create K8S cluster by TOSCA"
[oom.git]
/
kubernetes
/
aai
/
templates
/
aai-resources-deployment.yaml
diff --git
a/kubernetes/aai/templates/aai-resources-deployment.yaml
b/kubernetes/aai/templates/aai-resources-deployment.yaml
index
7ff5e66
..
2e0b049
100644
(file)
--- a/
kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/
kubernetes/aai/templates/aai-resources-deployment.yaml
@@
-50,7
+50,10
@@
spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- 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
name: aai-data
- mountPath: /var/log/onap
name: aai-resources-logs
@@
-69,6
+72,7
@@
spec:
imagePullPolicy: {{ .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
imagePullPolicy: {{ .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
name: filebeat-conf
- mountPath: /var/log/onap
name: aai-resources-logs
name: filebeat-conf
- mountPath: /var/log/onap
name: aai-resources-logs
@@
-78,28
+82,23
@@
spec:
- name: localtime
hostPath:
path: /etc/localtime
- name: localtime
hostPath:
path: /etc/localtime
+ - name: aai-chef-config
+ configMap:
+ name: aai-chef-config-configmap
- name: aai-data
- name: aai-data
-
hostPath
:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+
configMap
:
+ name: aai-resources-environments-configmap
- name: filebeat-conf
- 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
emptyDir: {}
- name: aai-resources-log-conf
configMap:
- name: aai-resources-logs
emptyDir: {}
- name: aai-resources-filebeat
emptyDir: {}
- name: aai-resources-log-conf
configMap:
- name: aai-resources-configmap
+ name: aai-resources-
log-
configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: aai-resources-configmap
- namespace: {{ .Values.nsPrefix }}-aai
-data:
-{{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }}
#{{ end }}
#{{ end }}