[Portal] Move (unused) readinessImage to global

[oom.git] / kubernetes / portal / charts / portal-mariadb / templates / job.yaml

diff --git a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
index 75d5bb0..812dc66 100644 (file)
--- a/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/templates/job.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +21,14 @@ metadata:
   labels:
     app: {{ include "common.name" . }}-job
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   template:
     metadata:
       labels:
         app: {{ include "common.name" . }}-job
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       restartPolicy: Never
       initContainers:
@@ -47,11 +48,11 @@ spec:
               fieldPath: metadata.namespace
       containers:
       - name: {{ include "common.name" . }}-job
-        image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.mariadbInitImage }}"
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.mariadbInitImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
-          value: "{{ .Release.Name }}-{{ .Values.service.name }}"
+          value: "{{ include "common.servicename" . }}"
         - name: DB_USER
           value: {{ .Values.config.mariadbUser }}
         - name: DB_PASS
@@ -60,11 +61,11 @@ spec:
         - name: SQL_SRC_DIR
           value: {{ .Values.config.sqlSourceDirectory }}
       - name: {{ include "common.name" . }}-oom-update-job
-        image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.mariadbInitImage }}"
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.mariadbInitImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DB_HOST
-          value: "{{ .Release.Name }}-{{ .Values.service.name }}"
+          value: "{{ include "common.servicename" . }}"
         - name: DB_USER
           value: {{ .Values.config.mariadbUser }}
         - name: DB_PORT
@@ -87,4 +88,4 @@ spec:
           name: {{ include "common.fullname" . }}-mariadb
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
-      restartPolicy: Never
\ No newline at end of file
+      restartPolicy: Never