Added missing maria db dependencies

If there are other inter-pod dependencies that should be
managed, please comment to let me know so they can be added.

Also addressed the missing globals section in the pods values.yaml
files and incorrect pull policy management to make them follow
the standard conventions

Change-Id: I3625f8452d90182391e1ff4af5fddfe9d0948a32
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: OOM-1472

2 files changed, 35 insertions, 2 deletions

diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
index 20068a8edd..ad3a19f37e 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-catalog-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-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 2083633599..105b3d4085 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -11,9 +11,25 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+  nodePortPrefix: 302
+  nodePortPrefixExt: 304
+  repository: nexus3.onap.org:10001
+  readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.0
+  persistence:
+    mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
 repository: nexus3.onap.org:10001
 image: onap/so/catalog-db-adapter:1.3.0-STAGING-latest
-pullPolicy: IfNotPresent
+pullPolicy: Always
+
 replicaCount: 1
 minReadySeconds: 10
 containerPort: 8082
@@ -56,6 +72,8 @@ livenessProbe:
     timeoutSeconds: 10
     successThreshold: 1
     failureThreshold: 3
+mariadb:
+  nameOverride: so-mariadb
 ingress:
   enabled: false
 nodeSelector: {}