diff options
author | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-04-25 15:41:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-04-25 15:41:12 +0000 |
commit | 8331e6a9722da7f733b93522e457750af06cb171 (patch) | |
tree | ada5e45f7865c2ac979fc82f935a714d26752f6e /kubernetes/sdc/charts/sdc-fe | |
parent | c50a17fcbba05cf8d73b077f440247a5b6d9aa71 (diff) | |
parent | 51a8b1b6482fda1c0865481b7e04c54023589392 (diff) |
Merge "Adding sdc-onboarding-be to OOM"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-fe')
-rw-r--r-- | kubernetes/sdc/charts/sdc-fe/Chart.yaml | 2 | ||||
-rw-r--r-- | kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml | 23 |
2 files changed, 21 insertions, 4 deletions
diff --git a/kubernetes/sdc/charts/sdc-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-fe/Chart.yaml index 9cbffbac4e..6580e891da 100644 --- a/kubernetes/sdc/charts/sdc-fe/Chart.yaml +++ b/kubernetes/sdc/charts/sdc-fe/Chart.yaml @@ -13,6 +13,6 @@ # limitations under the License. apiVersion: v1 -description: Service Design and Creation Front End +description: ONAP Service Design and Creation Front End name: sdc-fe version: 2.0.0
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml index 2d4e21360d..dc96fc77cd 100644 --- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml @@ -36,7 +36,11 @@ spec: - /root/ready.py args: - --container-name + - "sdc-kb" + - --container-name - "sdc-be" + - --container-name + - "sdc-onboarding-be" env: - name: NAMESPACE valueFrom: @@ -45,15 +49,27 @@ spec: fieldPath: metadata.namespace image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + - name: {{ include "common.name" . }}-job-completion + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}" + command: + - /root/job_complete.py + args: + - --job-name + - {{ .Release.Name }}-sdc-be-config-backend + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace containers: - name: {{ include "common.name" . }} - 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.internalPort2 }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container {{ if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: @@ -85,6 +101,7 @@ spec: mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logback mountPath: /tmp/logback.xml + subPath: logback.xml lifecycle: postStart: exec: |