diff options
author | Mike Elliott <mike.elliott@amdocs.com> | 2018-04-19 17:24:08 -0400 |
---|---|---|
committer | Mike Elliott <mike.elliott@amdocs.com> | 2018-04-19 17:29:53 -0400 |
commit | 282751f1c3c062ab6c0c3aa6c49b32417de360e4 (patch) | |
tree | af407f00fefe77dc631cd9f83d99662ac5c00eff /kubernetes/so/templates/deployment.yaml | |
parent | 100cfd1d9f8fefbb0338fc5122d936976f51f1b7 (diff) |
Fix SO healthcheck on multi-node cluster
Aligned service names (and numerous other minor fixes) with latest best practices
and standard templates.
Change-Id: I740fe299053805df60abcd6a6043031d8beda7e8
Issue-ID: OOM-909
Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
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 }} |