X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fcharts%2Foof-has%2Fcharts%2Foof-has-reservation%2Ftemplates%2Fdeployment.yaml;h=335ac4c5a76dbe4ce4984c8e92c2c16d51a81811;hb=a8672794ffc7c4b9486df575e665301fd9db3d97;hp=7c30360cd62310ce50294946ed7637313dde306b;hpb=5caa2645bf56867155e36d8562f1b8a4e0815e36;p=oom.git

diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
index 7c30360cd6..335ac4c5a7 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -29,14 +29,15 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
-      - command:
+      - name: {{ include "common.name" . }}-readiness
+        command:
         - /root/ready.py
         args:
         - --container-name
-        - music-tomcat
+        - music-springboot
         env:
         - name: NAMESPACE
           valueFrom:
@@ -45,12 +46,13 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
-      - command:
+
+      - name: {{ include "common.name" . }}-onboard-readiness
+        command:
         - /root/job_complete.py
         args:
         - -j
-        - "{{ .Release.Name }}-oof-has-onboard"
+        - "{{ include "common.release" . }}-oof-has-onboard"
         env:
         - name: NAMESPACE
           valueFrom:
@@ -59,12 +61,13 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-onboard-readiness
-      - command:
+
+      - name: {{ include "common.name" . }}-health-readiness
+        command:
         - /root/job_complete.py
         args:
         - -j
-        - "{{ .Release.Name }}-oof-has-healthcheck"
+        - "{{ include "common.release" . }}-oof-has-healthcheck"
         env:
         - name: NAMESPACE
           valueFrom:
@@ -73,8 +76,9 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-health-readiness
-      - command:
+
+      - name: {{ include "common.name" . }}-resrv-sms-readiness
+        command:
         - sh
         - -c
         - resp="FAILURE";
@@ -89,9 +93,9 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-resrv-sms-readiness
+
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.global.image.optf_has }}"
@@ -162,5 +166,6 @@ spec:
               path: healthy.sh
             - key: AAF_RootCA.cer
               path: AAF_RootCA.cer
+
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"