diff options
| author |   mayankg2703 <mayank.gupta@amdocs.com> | 2018-01-16 09:42:30 +0000 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-01-24 12:14:29 +0000 |
| commit | 85091152dd3a572f1ef33c73ff07446af1b97a57 (patch) | |
| tree | e8e45180f413a36e8a82e13b65b7a94db27c1058 /kubernetes/appc/templates | |
| parent | eea1d3ec1680d1ef203840986962f6535736ae38 (diff) | |
appc config seg
Issue-ID: OOM-552
Change-Id: Id953076056a0168f907e3fe906a7bbb2bd4a6cc7
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
Diffstat (limited to 'kubernetes/appc/templates')
| -rw-r--r-- | kubernetes/appc/templates/appc-conf-configmap.yaml | 9 | ||||
| -rw-r--r-- | kubernetes/appc/templates/appc-deployment.yaml | 31 | ||||
| -rw-r--r-- | kubernetes/appc/templates/appc-log-configmap.yaml | 17 |
3 files changed, 41 insertions, 16 deletions
diff --git a/kubernetes/appc/templates/appc-conf-configmap.yaml b/kubernetes/appc/templates/appc-conf-configmap.yaml new file mode 100644 index 0000000000..0e418d1e7a --- /dev/null +++ b/kubernetes/appc/templates/appc-conf-configmap.yaml @@ -0,0 +1,9 @@ +#{{ if not .Values.disableAppcAppc }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-conf-configmap + namespace: {{ .Values.nsPrefix }}-appc +data: +{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index f4593b0d73..8caf286043 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -49,15 +49,19 @@ spec: name: localtime readOnly: true - mountPath: /opt/openecomp/appc/data/properties/appc.properties - name: appc-properties + name: appc-conf + subPath: appc.properties - mountPath: /opt/openecomp/appc/data/properties/aaiclient.properties - name: appc-aaiclient-properties + name: appc-conf + subPath: aaiclient.properties - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties - name: sdnc-aaiclient-properties + name: appc-conf + subPath: aaiclient.properties - mountPath: /var/log/onap name: appc-logs - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg name: appc-log-config + subPath: org.ops4j.pax.logging.cfg ports: - containerPort: 8181 - containerPort: 1830 @@ -72,6 +76,7 @@ spec: volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml name: filebeat-conf + subPath: filebeat.yml - mountPath: /var/log/onap name: appc-logs - mountPath: /usr/share/filebeat/data @@ -81,24 +86,18 @@ spec: hostPath: path: /etc/localtime - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml + configMap: + name: appc-filebeat-configmap - name: appc-log-config - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/appc/org.ops4j.pax.logging.cfg + configMap: + name: appc-logging-cfg-configmap - name: appc-logs emptyDir: {} - name: appc-data-filebeat emptyDir: {} - - name: appc-properties - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties - - name: appc-aaiclient-properties - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/aaiclient.properties - - name: sdnc-aaiclient-properties - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties + - name: appc-conf + configMap: + name: appc-conf-configmap imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/appc/templates/appc-log-configmap.yaml b/kubernetes/appc/templates/appc-log-configmap.yaml new file mode 100644 index 0000000000..323f852779 --- /dev/null +++ b/kubernetes/appc/templates/appc-log-configmap.yaml @@ -0,0 +1,17 @@ +#{{ if not .Values.disableAppcAppc }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-filebeat-configmap + namespace: {{ .Values.nsPrefix }}-appc +data: +{{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-logging-cfg-configmap + namespace: {{ .Values.nsPrefix }}-appc +data: +{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} +#{{ end }} |