Merge "Reducing the size of some ms"

[oom.git] / kubernetes / aai / charts / aai-spike / templates / deployment.yaml

diff --git a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
index edf6ce8..a3ff068 100644 (file)
--- a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
@@ -92,8 +92,11 @@ spec:
           - mountPath: /opt/app/spike/config/spike.properties
             subPath: spike.properties
             name: {{ include "common.fullname" . }}-config
-          - mountPath: /opt/app/spike/config/schemaIngest.properties
-            subPath: schemaIngest.properties
+          - mountPath: /opt/app/spike/config/schema-ingest.properties
+            subPath: schema-ingest.properties
+            name: {{ include "common.fullname" . }}-config
+          - mountPath: /opt/app/spike/config/edgeprops-ingest.properties
+            subPath: edgeprops-ingest.properties
             name: {{ include "common.fullname" . }}-config
           - mountPath: /opt/app/spike/config/model/edge_props
             name: {{ include "common.fullname" . }}-edge-props-config
@@ -103,7 +106,7 @@ spec:
           - mountPath: /var/log/onap
             name: {{ include "common.fullname" . }}-logs
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -141,8 +144,10 @@ spec:
               path: spike.properties
             - key: spike-beans.xml
               path: spike-beans.xml
-            - key: schemaIngest.properties
-              path: schemaIngest.properties
+            - key: schema-ingest.properties
+              path: schema-ingest.properties
+            - key: edgeprops-ingest.properties
+              path: edgeprops-ingest.properties
             - key: logback.xml
               path: logback.xml
         - name: {{ include "common.fullname" . }}-edge-props-config