From 89c027908651b8edcc94dbc9aa529bb45523aedc Mon Sep 17 00:00:00 2001
From: "Arul.Nambi" <arul.nambi@amdocs.com>
Date: Wed, 20 Jun 2018 11:40:17 -0400
Subject: Exposing the node port for sparky-be

Removed the cluster ip and set the node port to 20. Also disabiling ssl
as portal does not support ssl yet.

Issue-ID: OOM-347
Change-Id: Ia0431bb4b72e709df7e867ccae01b0b8219088d9
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
---
 kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml | 6 +++---
 kubernetes/aai/charts/aai-sparky-be/templates/service.yaml    | 3 +--
 kubernetes/aai/charts/aai-sparky-be/values.yaml               | 3 ++-
 kubernetes/portal/charts/portal-mariadb/values.yaml           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kubernetes')

diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index c1b2c3ccae..b459646a6b 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
         - name: KEYSTORE_PASSWORD
           value: {{ .Values.config.keyStorePassword }}
         - name: SPARKY_SSL_ENABLED
-          value: 'true'
+          value: 'false'
         - name: SPARKY_PORTAL_ENABLED
           value: 'false'
         volumeMounts:
@@ -83,13 +83,13 @@ spec:
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort2 }}
+            port: {{ .Values.service.internalPort }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end -}}
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort2 }}
+            port: {{ .Values.service.internalPort }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources:
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
index e342a9a688..385cdeabca 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
@@ -21,5 +21,4 @@ spec:
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
-  clusterIP: None
+    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index c87ec5bf02..8321feb295 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -61,9 +61,10 @@ readiness:
   periodSeconds: 10
 
 service:
-  type: ClusterIP
+  type: NodePort
   portName: aai-sparky-be
   internalPort: 9517
+  nodePort: 20
   internalPort2: 8000
 
 ingress:
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index 49fc36f3a8..fe41734ea7 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -48,7 +48,7 @@ config:
   # application's front end hostname.  Must be resolvable on the client side environment
   vidHostName: "vid.api.simpledemo.onap.org"
   # aai sparky ui assignment for port 8080
-  aaiSparkyPort: "" # TODO: populate with
+  aaiSparkyPort: "30220"
   # application's front end hostname.  Must be resolvable on the client side environment
   aaiSparkyHostName: "aai.api.sparky.simpledemo.onap.org"
   # cli ui  assignment for port 8080
-- 
cgit 1.2.3-korg