From 59ce22ddfd867629eed557a32e9e8b880a4725a9 Mon Sep 17 00:00:00 2001
From: jhh <jorge.hernandez-herrero@att.com>
Date: Tue, 14 May 2019 17:59:36 -0500
Subject: Disable external ports and update versions

Change-Id: I1d781ad6d0177d6a103986b10f39e36453516e9f
Issue-ID: POLICY-1756
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---
 kubernetes/policy/charts/drools/charts/nexus/values.yaml | 7 ++++---
 kubernetes/policy/charts/drools/templates/service.yaml   | 7 +++++--
 kubernetes/policy/charts/drools/values.yaml              | 6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'kubernetes/policy/charts/drools')

diff --git a/kubernetes/policy/charts/drools/charts/nexus/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index e837bafa7e..62a17e515e 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/values.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2018-2019 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,10 +59,11 @@ readiness:
   path: /nexus/service/local/status
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: nexus
   portName: nexus
   externalPort: 8081
+  internalPort: 8081
   nodePort: 36
 
 ingress:
@@ -95,4 +96,4 @@ resources:
     requests:
       cpu: 2m
       memory: 1Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
diff --git a/kubernetes/policy/charts/drools/templates/service.yaml b/kubernetes/policy/charts/drools/templates/service.yaml
index 221063bd82..8a170070b3 100644
--- a/kubernetes/policy/charts/drools/templates/service.yaml
+++ b/kubernetes/policy/charts/drools/templates/service.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2018-2019 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,10 @@ spec:
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
+      name: {{ .Values.service.portName }}-{{ .Values.service.externalPort }}
+    - port: {{ .Values.service.externalPort2 }}
+      targetPort: {{ .Values.service.internalPort2 }}
+      name: {{ .Values.service.portName }}-{{ .Values.service.externalPort2 }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml
index fdb73e1485..9a6c93a39d 100644
--- a/kubernetes/policy/charts/drools/values.yaml
+++ b/kubernetes/policy/charts/drools/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
+image: onap/policy-pdpd-cl:1.4.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -58,11 +58,13 @@ readiness:
   periodSeconds: 10
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: drools
   portName: drools
+  internalPort: 6969
   externalPort: 6969
   nodePort: 17
+  internalPort2: 9696
   externalPort2: 9696
   nodePort2: 21
 
-- 
cgit 1.2.3-korg