+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: {{ include "common.name" . }}
+ name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
- /root/ready.py
args:
- --container-name
- - so-mariadb
+ - {{ .Values.mariadb.nameOverride }}
env:
- name: NAMESPACE
valueFrom:
- name: {{ .Chart.Name }}
command:
- /tmp/start-jboss-server.sh
- image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort4 }}
- containerPort: {{ .Values.service.internalPort5 }}
# disable liveness probe when breakpoints set in debugger
- # so K8s doesn't restart unresponsive container
- {{- if eq .Values.liveness.enabled true }}
+ # so K8s doesn't restart unresponsive container
+ {{ if .Values.liveness.enabled }}
livenessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
- {{ end -}}
+ {{ end }}
readinessProbe:
tcpSocket:
port: {{ .Values.service.internalPort }}
- mountPath: /opt/jboss/standalone/configuration/standalone-full-ha-mso.xml
name: so-config
subPath: standalone-full-ha-mso.xml
+ - mountPath: /etc/mso/config.d/topology.properties
+ name: so-config
+ subPath: topology.properties
+ - mountPath: /etc/mso/config.d/mso.workflow-message-adapter.properties
+ name: so-config
+ subPath: mso.workflow-message-adapter.properties
+ - mountPath: /etc/mso/config.d/mso.bpmn.urn.properties
+ name: so-config
+ subPath: mso.bpmn.urn.properties
- mountPath: /var/log/onap
name: so-logs
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
-
+
# side car containers
- name: filebeat-onap
image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
- key: mso-docker.json
path: mso-docker.json
mode: 0755
- - key: aai.crt
- path: aai.crt
+ - key: onap-ca.crt
+ path: onap-ca.crt
mode: 0755
- key: encryption.key
path: encryption.key
- key: standalone-full-ha-mso.xml
path: standalone-full-ha-mso.xml
mode: 0644
+ - key: topology.properties
+ path: topology.properties
+ mode: 0644
+ - key: mso.workflow-message-adapter.properties
+ path: mso.workflow-message-adapter.properties
+ mode: 0644
+ - key: mso.bpmn.urn.properties
+ path: mso.bpmn.urn.properties
+ mode: 0644
- name: so-logs
emptyDir: {}
- name: so-data-filebeat
path: start-jboss-server.sh
mode: 0755
imagePullSecrets:
- - name: "{{ include "common.name" . }}-docker-registry-key"
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
+