2 files changed, 17 insertions, 113 deletions
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
@@ -34,6 +34,21 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - {{ .Values.mariadb.nameOverride }}
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "common.repository" . }}/{{ .Values.image }}
@@ -73,7 +88,7 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ include "common.fullname" . }}-configmap
-        imagePullPolicy:  {{ index .Values "global" "pullPolicy" }}
+        imagePullPolicy:  {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - name: logs
           mountPath: /app/logs
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
index 085d986eb4..741614886c 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
@@ -21,117 +21,6 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    msb.onap.org/service-info: '[
-          {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/services",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1" ,
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/updateInfraRequest",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/getInfraRequest",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-          {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/getSiteStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/updateServiceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/initResourceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/getResourceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/updateResourceOperationStatus",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/getCloudOrchestrationFiltersFromInfraActive",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/getOrchestrationFiltersFromInfraActive",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/checkVnfIdStatus/{operationalEnvironmentId}",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         },
-         {
-        "serviceName": "so/reqdb",
-        "version": "v1",
-        "url": "/RequestsDbAdapter/infraActiveRequests/checkInstanceNameDuplicate",
-        "protocol": "REST",
-        "port": "{{ .Values.service.externalPort }}",
-        "visualRange":"1",
-        "lb_policy":"ip_hash"
-         }
-         ]'
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -146,4 +35,4 @@ spec:
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
-\ No newline at end of file
+    release: {{ .Release.Name }}