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/charts/mariadb/templates | |
| 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/charts/mariadb/templates')
| -rw-r--r-- | kubernetes/so/charts/mariadb/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/so/charts/mariadb/templates/service.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/so/charts/mariadb/templates/deployment.yaml b/kubernetes/so/charts/mariadb/templates/deployment.yaml index 5267cc0409..3e263ce097 100644 --- a/kubernetes/so/charts/mariadb/templates/deployment.yaml +++ b/kubernetes/so/charts/mariadb/templates/deployment.yaml @@ -32,8 +32,8 @@ spec: spec: hostname: mariadb containers: - - name: {{ .Chart.Name }} - image: {{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }} + - name: {{ include "common.name" . }} + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/so/charts/mariadb/templates/service.yaml b/kubernetes/so/charts/mariadb/templates/service.yaml index 11b3b48bd9..eeebdcbae2 100644 --- a/kubernetes/so/charts/mariadb/templates/service.yaml +++ b/kubernetes/so/charts/mariadb/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -27,12 +27,12 @@ spec: ports: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.externalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} {{- end}} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }}
\ No newline at end of file |