From 8a32c4269a6d1dcdcdee6c2548043639754db936 Mon Sep 17 00:00:00 2001
From: yuryn <Yury.Novitsky@Amdocs.com>
Date: Mon, 28 Aug 2017 14:45:23 +0300
Subject: [PATCH] Add dependencies to aai-deployment

1. Add to aai-deployment dependency in aai-resources and aai-traversal
2. Fix readiness ports for data-router and sparky-be

Change-Id: Icfcd4685ac3cad8e463b5f8176b28f51890d1e38
Issue-ID: OOM-65
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
---
 kubernetes/aai/aai-deployment.yaml         | 22 ++++++++++++++++++++++
 kubernetes/aai/data-router-deployment.yaml |  2 +-
 kubernetes/aai/sparky-be-deployment.yaml   |  3 +--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/kubernetes/aai/aai-deployment.yaml b/kubernetes/aai/aai-deployment.yaml
index d8ac5d749d..cacc4fd80a 100644
--- a/kubernetes/aai/aai-deployment.yaml
+++ b/kubernetes/aai/aai-deployment.yaml
@@ -11,6 +11,28 @@ spec:
       labels:
         app: aai-service
       name: aai-service
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[{
+            "args": [
+                "--container-name", "aai-resources",
+                "--container-name", "aai-traversal"
+            ],
+            "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-service-readiness"
+          }]'
     spec:
       containers:
       - name: aai-service
diff --git a/kubernetes/aai/data-router-deployment.yaml b/kubernetes/aai/data-router-deployment.yaml
index 6ede270e43..c50792a848 100644
--- a/kubernetes/aai/data-router-deployment.yaml
+++ b/kubernetes/aai/data-router-deployment.yaml
@@ -41,7 +41,7 @@ spec:
         - containerPort: 9502
         readinessProbe:
           tcpSocket:
-            port: 8080
+            port: 9502
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
diff --git a/kubernetes/aai/sparky-be-deployment.yaml b/kubernetes/aai/sparky-be-deployment.yaml
index 931e38e64e..56377d8dd2 100644
--- a/kubernetes/aai/sparky-be-deployment.yaml
+++ b/kubernetes/aai/sparky-be-deployment.yaml
@@ -32,11 +32,10 @@ spec:
         - mountPath: /logs/
           name: aai-sparky-be-logs
         ports:
-        - containerPort: 8000
         - containerPort: 9517
         readinessProbe:
           tcpSocket:
-            port: 8080
+            port: 9517
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
-- 
2.16.6