diff options
author | Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-04-19 23:41:22 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-04-19 23:41:22 +0000 |
commit | 4cb6d545d144933753535185c8c4353c4b992b3c (patch) | |
tree | a254c205bfe033e8c0639704fd50b6d075f5cd67 /kubernetes/so/templates/deployment.yaml | |
parent | 87274bc2e86ea15b777b82be36ad029e3f94bac7 (diff) | |
parent | 282751f1c3c062ab6c0c3aa6c49b32417de360e4 (diff) |
Merge "Fix SO healthcheck on multi-node cluster"
Diffstat (limited to 'kubernetes/so/templates/deployment.yaml')
-rw-r--r-- | kubernetes/so/templates/deployment.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml index 67630d2619..bc01727bd3 100644 --- a/kubernetes/so/templates/deployment.yaml +++ b/kubernetes/so/templates/deployment.yaml @@ -35,7 +35,7 @@ spec: - /root/ready.py args: - --container-name - - mariadb + - {{ .Values.mariadb.nameOverride }} env: - name: NAMESPACE valueFrom: @@ -49,7 +49,7 @@ spec: - name: {{ .Chart.Name }} command: - /tmp/start-jboss-server.sh - image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}" + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -58,14 +58,14 @@ spec: - 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 }} |