diff options
Diffstat (limited to 'kubernetes/mso')
| -rw-r--r-- | kubernetes/mso/templates/mso-deployment.yaml | 53 | ||||
| -rw-r--r-- | kubernetes/mso/values.yaml | 2 |
2 files changed, 27 insertions, 28 deletions
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index a33d9b08fa..2abb29091f 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -14,33 +14,22 @@ spec: labels: app: mso name: mso - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "mso-readiness" - } - ]' spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - mariadb + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: mso-readiness containers: - command: - /tmp/start-jboss-server.sh @@ -65,6 +54,8 @@ spec: name: logback-tenant - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.vnf.xml name: logback-vnf + - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.vfc.xml + name: logback-vfc - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-appc-adapter-config/logback.appc.xml name: logback-appc - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-requests-db-adapter-config/logback.msorequestsdbadapter.xml @@ -75,6 +66,8 @@ spec: name: logback-sdnc - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-bpmn-config/logback.bpmn.xml name: logback-bpmn + - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-workflow-message-adapter-config/logback.workflow-message-adapter.xml + name: logback-workflow-message-adapter env: - name: JBOSS_DEBUG value: "false" @@ -115,6 +108,9 @@ spec: - name: logback-vnf hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.vnf.xml + - name: logback-vfc + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.vfc.xml - name: logback-appc hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.appc.xml @@ -130,6 +126,9 @@ spec: - name: logback-bpmn hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.bpmn.xml + - name: logback-workflow-message-adapter + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.workflow-message-adapter.xml - name: mso hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso @@ -145,4 +144,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml index 4584e73c9b..fd8b6690e8 100644 --- a/kubernetes/mso/values.yaml +++ b/kubernetes/mso/values.yaml @@ -3,6 +3,6 @@ pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 - mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest + mso: nexus3.onap.org:10001/openecomp/mso:v1.1.1 mariadb: nexus3.onap.org:10001/mariadb:10.1.11 filebeat: docker.elastic.co/beats/filebeat:5.5.0 |