From 76092d6462ccbdd37a46071fa87804e9c9afdcd3 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Fri, 1 Sep 2017 02:15:17 +0000
Subject: getting traversal, resources, & gremlin to boot

- reverted some log dir changes that cause chef to complain
about pre-existing directories
- had to fork and modify docker-entrypoint for both
resources and traversal to avoid git clone of aai-data
- updated gremlin hostname so that container comes up...
was complaining about failure to bind to port 8182

Issue-ID: OOM-65

Change-Id: I84d2647af588e39502a075880a163104bb39540e
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
---
 .../aai/templates/aai-resources-deployment.yaml    | 38 ++++++++++++++++----
 .../aai/templates/aai-traversal-deployment.yaml    | 40 ++++++++++++++++++----
 kubernetes/aai/templates/gremlin-deployment.yaml   |  2 +-
 3 files changed, 67 insertions(+), 13 deletions(-)

(limited to 'kubernetes/aai')

diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index b6242ee292..e18fcf20d7 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -12,6 +12,32 @@ spec:
       labels:
         app: aai-resources
       name: aai-resources
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+              "args": [
+                  "--container-name",
+                  "hbase"
+              ],
+              "command": [
+                  "/root/ready.py"
+              ],
+              "env": [
+                  {
+                      "name": "NAMESPACE",
+                      "valueFrom": {
+                          "fieldRef": {
+                              "apiVersion": "v1",
+                              "fieldPath": "metadata.namespace"
+                          }
+                      }
+                  }
+              ],
+              "image": "oomk8s/readiness-check:1.0.0",
+              "imagePullPolicy": "Always",
+              "name": "aai-resources-readiness"
+          }
+        ]'      
     spec:
       containers:
       - name: aai-resources
@@ -29,12 +55,12 @@ spec:
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
         volumeMounts:
-        - mountPath: /opt/aai/logroot/AAI-RES/
+        - mountPath: /opt/aai/logroot/
           name: aai-resources-logs
-        - mountPath: /var/chef/aai-config/
-          name: aai-config
         - mountPath: /var/chef/aai-data/
           name: aai-data
+        - mountPath: /docker-entrypoint.sh
+          name: entrypoint-override
         ports:
         - containerPort: 8447
         readinessProbe:
@@ -46,12 +72,12 @@ spec:
       - name: aai-resources-logs
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/logs/"
-      - name: aai-config
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/"
       - name: aai-data
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+      - name: entrypoint-override
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/docker-entrypoint.sh"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index cb56be8fd9..59ea7bad4d 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -12,6 +12,34 @@ spec:
       labels:
         app: aai-traversal
       name: aai-traversal
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+              "args": [
+                  "--container-name",
+                  "hbase",
+                  "--container-name",
+                  "aai-resources"
+              ],
+              "command": [
+                  "/root/ready.py"
+              ],
+              "env": [
+                  {
+                      "name": "NAMESPACE",
+                      "valueFrom": {
+                          "fieldRef": {
+                              "apiVersion": "v1",
+                              "fieldPath": "metadata.namespace"
+                          }
+                      }
+                  }
+              ],
+              "image": "oomk8s/readiness-check:1.0.0",
+              "imagePullPolicy": "Always",
+              "name": "aai-traversal-readiness"
+          }
+        ]'      
     spec:
       containers:
       - name: aai-traversal
@@ -29,12 +57,12 @@ spec:
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
         volumeMounts:
-        - mountPath: /opt/aai/logroot/AAI-GQ/
+        - mountPath: /opt/aai/logroot/
           name: aai-traversal-logs
-        - mountPath: /var/chef/aai-config/
-          name: aai-config
         - mountPath: /var/chef/aai-data/
           name: aai-data
+        - mountPath: /docker-entrypoint.sh
+          name: entrypoint-override
         ports:
         - containerPort: 8446
         readinessProbe:
@@ -46,12 +74,12 @@ spec:
       - name: aai-traversal-logs
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/logs/"
-      - name: aai-config
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/"
       - name: aai-data
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+      - name: entrypoint-override
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/docker-entrypoint.sh"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml
index aea89ad51f..ee98795235 100644
--- a/kubernetes/aai/templates/gremlin-deployment.yaml
+++ b/kubernetes/aai/templates/gremlin-deployment.yaml
@@ -50,7 +50,7 @@ spec:
         - name: SERVER_TABLE
           value: aaigraph.dev
         - name: GREMLIN_HOST
-          value: "gremlin.{{ .Values.nsPrefix }}-aai"
+          value: "gremlin"
         ports:
         - containerPort: 8182
         readinessProbe:
-- 
cgit 1.2.3-korg