Fix inconsistent repository references

Issue-ID: OOM-874

Changes to be committed:
	modified:   aai/charts/aai-babel/templates/deployment.yaml
	modified:   aai/charts/aai-champ/templates/deployment.yaml
	modified:   aai/charts/aai-data-router/templates/deployment.yaml
	modified:   aai/charts/aai-gizmo/templates/deployment.yaml
	modified:   aai/charts/aai-modelloader/templates/deployment.yaml
	modified:   aai/charts/aai-resources/templates/deployment.yaml
	modified:   aai/charts/aai-search-data/templates/deployment.yaml
	modified:   aai/charts/aai-sparky-be/templates/deployment.yaml
	modified:   aai/charts/aai-traversal/templates/deployment.yaml
	modified:   aai/charts/aai-traversal/templates/job.yaml
	modified:   appc/charts/appc-cdt/templates/deployment.yaml
	modified:   appc/templates/statefulset.yaml
	modified:   clamp/charts/mariadb/templates/deployment.yaml
	modified:   clamp/templates/deployment.yaml
	modified:   cli/templates/deployment.yaml
	modified:   common/dgbuilder/templates/deployment.yaml
	modified:   common/mariadb-galera/templates/statefulset.yaml
	modified:   dcaegen2/charts/dcae-bootstrap/templates/job.yaml
	modified:   dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
	modified:   dcaegen2/charts/dcae-healthcheck/templates/deployment.yaml
	modified:   dcaegen2/charts/dcae-redis/templates/statefulset.yaml
	modified:   dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
	modified:   dmaap/charts/dmaap-bus-controller/values.yaml
	modified:   esr/charts/esr-gui/templates/deployment.yaml
	modified:   esr/templates/deployment.yaml
	modified:   msb/charts/kube2msb/templates/deployment.yaml
	modified:   msb/charts/msb-discovery/templates/deployment.yaml
	modified:   msb/charts/msb-eag/templates/deployment.yaml
	modified:   msb/charts/msb-iag/templates/deployment.yaml
	modified:   multicloud/charts/multicloud-ocata/templates/deployment.yaml
	modified:   multicloud/charts/multicloud-vio/templates/deployment.yaml
	modified:   multicloud/charts/multicloud-windriver/templates/deployment.yaml
	modified:   multicloud/templates/deployment.yaml
	modified:   policy/charts/brmsgw/templates/deployment.yaml
	modified:   policy/charts/drools/charts/nexus/templates/deployment.yaml
	modified:   policy/charts/drools/templates/statefulset.yaml
	modified:   policy/charts/mariadb/templates/deployment.yaml
	modified:   policy/charts/pdp/templates/statefulset.yaml
	modified:   policy/templates/deployment.yaml
	modified:   portal/charts/portal-app/templates/deployment.yaml
	modified:   portal/charts/portal-cassandra/templates/deployment.yaml
	modified:   portal/charts/portal-mariadb/templates/deployment.yaml
	modified:   portal/charts/portal-sdk/templates/deployment.yaml
	modified:   portal/charts/portal-widget/templates/deployment.yaml
	modified:   portal/charts/portal-zookeeper/templates/deployment.yaml
	modified:   sdnc/charts/dmaap-listener/templates/deployment.yaml
	modified:   sdnc/charts/sdnc-portal/templates/deployment.yaml
	modified:   sdnc/charts/ueb-listener/templates/deployment.yaml
	modified:   sdnc/templates/statefulset.yaml
	modified:   uui/charts/uui-server/templates/deployment.yaml
	modified:   uui/templates/deployment.yaml
	modified:   vid/charts/mariadb/templates/deployment.yaml
	modified:   vid/templates/deployment.yaml

Change-Id: I00aaa1eff3b870db3b475365eeda3f2e10aef6b9
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

10 files changed, 10 insertions, 10 deletions

diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
index 15cd163edb..af25b47624 100644
--- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       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 }}
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 9a5d0ee2aa..d7fde324ae 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       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 }}
diff --git a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
index ceb9884a8c..f06e8b23eb 100644
--- a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
@@ -58,7 +58,7 @@ spec:
           mountPath: /logroot/
       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 }}
         env:
         - name: SERVICE_BEANS
diff --git a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
index 80b5390d08..7b0a57791c 100644
--- a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.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 }}
diff --git a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
index 4bfa67de41..f93a0d349d 100644
--- a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       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 }}
         env:
         - name: CONFIG_HOME
diff --git a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index 6c65bce4cc..6ed5a65865 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@ -433,7 +433,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       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 }}
         env:
         - name: LOCAL_USER_ID
diff --git a/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml b/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
index beaee7d374..c841c383e9 100644
--- a/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       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 }}
         env:
         - name: CONFIG_HOME
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index 424cf1155d..c1b2c3ccae 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       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 }}
         env:
         - name: CONFIG_HOME
diff --git a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
index bda80a0483..8e426e8090 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
@@ -265,7 +265,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       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 }}
         env:
         - name: DISABLE_UPDATE_QUERY
diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
index b9b2501304..8bb7a40c17 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
@@ -47,7 +47,7 @@ spec:
         name: {{ include "common.name" . }}-readiness
       containers:
       - name: {{ include "common.name" . }}-job
-        image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command:
         - bash