Merge "Add multicloud-k8s vim type to configuration"

diff --git a/kubernetes/aai b/kubernetes/aai
index e67a94e..b299e97 160000 (submodule)
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit e67a94e6be333271c8237d6ebd5fb0f489401350
+Subproject commit b299e9707a869769510aa25952720a595304bedc

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index 19e55ac..d471990 100644 (file)
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -90,7 +90,7 @@ postgres:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.16
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.17
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager
@@ -102,7 +102,7 @@ componentImages:
   tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1
   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.4
   snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
-  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.2
+  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.3
   hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.1.0
 
 # Resource Limit flavor -By Default using small

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index 096b51c..92349b8 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "60"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
 

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
index 8a2cf69..e411b2b 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "30"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
 

diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index 6d246de..b6f75d5 100644 (file)
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -29,10 +29,12 @@ spec:
         env:
         - name: DELAY
           value: "30"
+    {{- if .Values.global.allow_http }}
         - name: PROTO
           value: "http"
         - name: PORT
           value: "8080"
+    {{ end }}
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
         volumeMounts:

diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 333a3e3..d5b7bff 100644 (file)
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -25,7 +25,7 @@ global:
   clientImage: onap/dmaap/dbc-client:1.0.9
 
 #Global DMaaP app config
-  allow_http: false
+  allow_http: true
 
 # application configuration
 config:

diff --git a/kubernetes/multicloud/charts/multicloud-azure/values.yaml b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
index 99e5a6a..88746af 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-azure/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
@@ -57,7 +57,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   portName: multicloud-azure
   externalPort: 9008
   internalPort: 9008

diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
index e856e12..77b30bc 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
@@ -56,7 +56,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-fcaps
   portName: multicloud-fcaps
   externalPort: 9011

diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/templates/.service.yaml.swp b/kubernetes/multicloud/charts/multicloud-lenovo/templates/.service.yaml.swp
deleted file mode 100644 (file)
index 51113a2..0000000
Binary files a/kubernetes/multicloud/charts/multicloud-lenovo/templates/.service.yaml.swp and /dev/null differ

diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
index ff4b44b..38f7c74 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
@@ -40,7 +40,7 @@ config:
     password: AAI
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-thinkcloud
   portName: multicloud-thinkcloud
   externalPort: 9010

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
index de77ed0..85b8b4d 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
@@ -57,7 +57,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-ocata
   portName: multicloud-ocata
   externalPort: 9006

diff --git a/kubernetes/multicloud/charts/multicloud-pike/values.yaml b/kubernetes/multicloud/charts/multicloud-pike/values.yaml
index 4241887..7e2cfd4 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/values.yaml
@@ -56,7 +56,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-pike
   portName: multicloud-pike
   externalPort: 9007

diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
index 32dcb8f..05e7f01 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
@@ -56,7 +56,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-starlingx
   portName: multicloud-starlingx
   externalPort: 9009

diff --git a/kubernetes/multicloud/charts/multicloud-vio/values.yaml b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
index 0da23dd..f44ab0b 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
@@ -57,7 +57,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-vio
   portName: multicloud-vio
   externalPort: 9004

diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index 4b8b763..3c741fb 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -41,7 +41,7 @@ config:
     password: AAI
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud-titaniumcloud
   portName: multicloud-titaniumcloud
   externalPort: 9005

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 889c06b..fdb4d9b 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -64,7 +64,7 @@ liveness:
   enabled: true
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: multicloud
   portName: multicloud-framework
   externalPort: 9001

diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index 712da12..889e25e 100644 (file)
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
             - name: ONAP_CLOUDOWNER
               value: {{ .Values.config.cloudOwner }}
             - name: NBI_URL
-              value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v3"
+              value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v4"
             - name: SDC_HOST
               value: "http://sdc-be.{{ include "common.namespace" . }}:8080"
             - name: SDC_HEADER_ECOMPINSTANCEID

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 9f50620..08ba011 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -28,7 +28,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:3.0.2
+image: onap/externalapi/nbi:4.0.0
 pullPolicy: Always
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml
index 56d3ad6..096332b 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml
@@ -25,12 +25,12 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-optimizer:latest
+image: onap/optf-cmso-optimizer:2.0.0
 pullPolicy: Always
 
 #init container image
 dbinit:
-  image: onap/optf-cmso-dbinit:latest
+  image: onap/optf-cmso-dbinit:2.0.0
 
 # flag to enable debugging - application support required
 debugEnabled: false

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml
index bdaa948..3dad361 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml
@@ -27,12 +27,12 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-service:latest
+image: onap/optf-cmso-service:2.0.0
 pullPolicy: Always
 
 #init container image
 dbinit:
-  image: onap/optf-cmso-dbinit:latest
+  image: onap/optf-cmso-dbinit:2.0.0
 
 # flag to enable debugging - application support required
 debugEnabled: false

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml
index 84535be..7d093c1 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml
@@ -26,7 +26,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-ticketmgt:latest
+image: onap/optf-cmso-ticketmgt:2.0.0
 pullPolicy: Always
 
 

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml
index 70b0b61..dc8040e 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml
@@ -25,7 +25,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-topology:latest
+image: onap/optf-cmso-topology:2.0.0
 pullPolicy: Always
 
 

diff --git a/kubernetes/oof/charts/oof-has/values.yaml b/kubernetes/oof/charts/oof-has/values.yaml
index 69e24c7..8bc3e17 100755 (executable)
--- a/kubernetes/oof/charts/oof-has/values.yaml
+++ b/kubernetes/oof/charts/oof-has/values.yaml
@@ -25,7 +25,7 @@ global:
   commonConfigPrefix: onap-oof-has
   image:
     readiness: oomk8s/readiness-check:2.0.0
-    optf_has: onap/optf-has:1.3.0-SNAPSHOT-latest
+    optf_has: onap/optf-has:1.3.0
     filebeat: docker.elastic.co/beats/filebeat:5.5.0
 
 pullPolicy: Always

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 5099091..bf87f0f 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -26,7 +26,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-osdf:1.3.0-SNAPSHOT-latest
+image: onap/optf-osdf:1.3.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
index 3952a4c..7f611a1 100644 (file)
--- a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
+++ b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
@@ -63,5 +63,5 @@ BRMS_UEB_API_KEY=
 BRMS_UEB_API_SECRET=
 
 #Dependency.json file version
-BRMS_DEPENDENCY_VERSION=1.3.1
-BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT
+BRMS_DEPENDENCY_VERSION=1.4.0
+BRMS_MODELS_DEPENDENCY_VERSION=2.0.0

diff --git a/kubernetes/policy/charts/brmsgw/values.yaml b/kubernetes/policy/charts/brmsgw/values.yaml
index 0001d9a..9ac8988 100644 (file)
--- a/kubernetes/policy/charts/brmsgw/values.yaml
+++ b/kubernetes/policy/charts/brmsgw/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.
@@ -26,7 +26,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.4-SNAPSHOT-latest
+image: onap/policy-pe:1.4.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -58,10 +58,11 @@ readiness:
   periodSeconds: 10
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: brmsgw
   portName: brmsgw
   externalPort: 9989
+  internalPort: 9989
   nodePort: 16
 
 

diff --git a/kubernetes/policy/charts/drools/charts/nexus/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index e837baf..62a17e5 100644 (file)
--- 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 221063b..8a17007 100644 (file)
--- 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 fdb73e1..9a6c93a 100644 (file)
--- 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
 

diff --git a/kubernetes/policy/charts/mariadb/templates/service.yaml b/kubernetes/policy/charts/mariadb/templates/service.yaml
index 7660ef7..9d5d13a 100644 (file)
--- a/kubernetes/policy/charts/mariadb/templates/service.yaml
+++ b/kubernetes/policy/charts/mariadb/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.
@@ -25,9 +25,9 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   ports:
-    - port: {{ .Values.service.internalPort }}
+    - port: {{ .Values.service.externalPort }}
+      targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
-  clusterIP: None

diff --git a/kubernetes/policy/charts/mariadb/values.yaml b/kubernetes/policy/charts/mariadb/values.yaml
index 90f5be4..fcd7093 100644 (file)
--- a/kubernetes/policy/charts/mariadb/values.yaml
+++ b/kubernetes/policy/charts/mariadb/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.
@@ -69,6 +69,7 @@ service:
   type: ClusterIP
   name: policydb
   portName: policydb
+  externalPort: 3306
   internalPort: 3306
 
 ingress:
@@ -92,4 +93,4 @@ resources:
     requests:
       cpu: 20m
       memory: 1Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}

diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 6794681..116ffe2 100644 (file)
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.4-SNAPSHOT-latest
+image: onap/policy-pe:1.4.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/charts/policy-apex-pdp/values.yaml b/kubernetes/policy/charts/policy-apex-pdp/values.yaml
index 7099430..f9e0c8d 100644 (file)
--- a/kubernetes/policy/charts/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/values.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright (C) 2019 AT&T Intellectual Property.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-apex-pdp:2.1-SNAPSHOT-latest
+image: onap/policy-apex-pdp:2.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -56,10 +57,11 @@ readiness:
   periodSeconds: 10
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: policy-apex-pdp
   portName: policy-apex-pdp
   externalPort: 6969
+  internalPort: 6969
   nodePort: 37
 
 ingress:

diff --git a/kubernetes/policy/charts/policy-api/templates/service.yaml b/kubernetes/policy/charts/policy-api/templates/service.yaml
index 81789f2..e6ff6fb 100644 (file)
--- a/kubernetes/policy/charts/policy-api/templates/service.yaml
+++ b/kubernetes/policy/charts/policy-api/templates/service.yaml
@@ -34,7 +34,7 @@ spec:
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       name: {{ .Values.service.portName }}
     {{- else -}}
-    - port: {{ .Values.service.internalPort }}
+    - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName }}
     {{- end}}

diff --git a/kubernetes/policy/charts/policy-api/values.yaml b/kubernetes/policy/charts/policy-api/values.yaml
index acb9f6b..8660d3b 100644 (file)
--- a/kubernetes/policy/charts/policy-api/values.yaml
+++ b/kubernetes/policy/charts/policy-api/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-api:2.0.0-SNAPSHOT-latest
+image: onap/policy-api:2.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -56,9 +56,10 @@ readiness:
   periodSeconds: 10
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: policy-api
   portName: policy-api
+  externalPort: 6969
   internalPort: 6969
   nodePort: 40
 

diff --git a/kubernetes/policy/charts/policy-distribution/templates/service.yaml b/kubernetes/policy/charts/policy-distribution/templates/service.yaml
index be6b567..5108c55 100644 (file)
--- a/kubernetes/policy/charts/policy-distribution/templates/service.yaml
+++ b/kubernetes/policy/charts/policy-distribution/templates/service.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright (C) 2019 AT&T Intellectual Property.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -28,9 +29,9 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   ports:
-    - port: {{ .Values.service.internalPort }}
+    - port: {{ .Values.service.externalPort }}
+      targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
-  clusterIP: None

diff --git a/kubernetes/policy/charts/policy-distribution/values.yaml b/kubernetes/policy/charts/policy-distribution/values.yaml
index 65f02cb..935e7e6 100644 (file)
--- a/kubernetes/policy/charts/policy-distribution/values.yaml
+++ b/kubernetes/policy/charts/policy-distribution/values.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright (C) 2019 AT&T Intellectual Property.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -27,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-distribution:2.1.0-SNAPSHOT-latest
+image: onap/policy-distribution:2.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -58,6 +59,7 @@ service:
   type: ClusterIP
   name: policy-distribution
   portName: policy-distribution
+  externalPort: 6969
   internalPort: 6969
 
 ingress:

diff --git a/kubernetes/policy/charts/policy-pap/templates/service.yaml b/kubernetes/policy/charts/policy-pap/templates/service.yaml
index f4a3114..6df7781 100644 (file)
--- a/kubernetes/policy/charts/policy-pap/templates/service.yaml
+++ b/kubernetes/policy/charts/policy-pap/templates/service.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019 Nordix Foundation.
+#   Modifications Copyright (C) 2019 AT&T Intellectual Property.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -28,9 +29,9 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   ports:
-    - port: {{ .Values.service.internalPort }}
+    - port: {{ .Values.service.externalPort }}
+      targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
-  clusterIP: None

diff --git a/kubernetes/policy/charts/policy-pap/values.yaml b/kubernetes/policy/charts/policy-pap/values.yaml
index 4736d1a..e240460 100644 (file)
--- a/kubernetes/policy/charts/policy-pap/values.yaml
+++ b/kubernetes/policy/charts/policy-pap/values.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019 Nordix Foundation.
+#   Modifications Copyright (C) 2019 AT&T Intellectual Property.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -27,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pap:2.0.0-SNAPSHOT-latest
+image: onap/policy-pap:2.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -59,6 +60,7 @@ service:
   name: policy-pap
   portName: policy-pap
   internalPort: 6969
+  externalPort: 6969
 
 ingress:
   enabled: false

diff --git a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties
index f4b4f93..be9a3fa 100644 (file)
--- a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties
+++ b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/xacml.properties
@@ -50,4 +50,4 @@ xacml.pip.engines=count-recent-operations,get-operation-outcome
 javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
 javax.persistence.jdbc.url=jdbc:mariadb://{{ .Values.global.mariadb.nameOverride }}:3306/operationshistory
 javax.persistence.jdbc.user=policy_user
-javax.persistence.jdbc.password=cG9saWN5X3VzZXI=
\ No newline at end of file
+javax.persistence.jdbc.password=cG9saWN5X3VzZXI=

diff --git a/kubernetes/policy/charts/policy-xacml-pdp/values.yaml b/kubernetes/policy/charts/policy-xacml-pdp/values.yaml
index fcfbab2..ed74f3d 100644 (file)
--- a/kubernetes/policy/charts/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/charts/policy-xacml-pdp/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-xacml-pdp:2.0.0-SNAPSHOT-latest
+image: onap/policy-xacml-pdp:2.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/templates/service.yaml b/kubernetes/policy/templates/service.yaml
index 221063b..8a17007 100644 (file)
--- a/kubernetes/policy/templates/service.yaml
+++ b/kubernetes/policy/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/values.yaml b/kubernetes/policy/values.yaml
index 48a5dca..df8a3d3 100644 (file)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/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.
@@ -41,7 +41,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.4-SNAPSHOT-latest
+image: onap/policy-pe:1.4.0
 pullPolicy: Always
 
 subChartsOnly:
@@ -91,8 +91,10 @@ service:
   type: NodePort
   name: pap
   portName: pap
+  internalPort: 8443
   externalPort: 8443
   nodePort: 19
+  internalPort2: 9091
   externalPort2: 9091
   nodePort2: 18
 

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
index 3a50130..dba7f59 100644 (file)
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image:  onap/network-discovery:1.5.0-SNAPSHOT-latest
+image:  onap/network-discovery:1.5.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
index b1065c1..ac8a379 100644 (file)
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image:  onap/service-decomposition:1.5.0-SNAPSHOT-latest
+image:  onap/service-decomposition:1.5.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 4623738..aa8951c 100644 (file)
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-app:2.5.0-STAGING-latest
+image: onap/portal-app:2.5.0
 pullPolicy: Always
 
 # default number of instances

diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index e6d7d11..f040d10 100644 (file)
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -24,7 +24,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-db:2.5.0-STAGING-latest
+image: onap/portal-db:2.5.0
 pullPolicy: Always
 
 readinessImage: readiness-check:2.0.0

diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index b61c84a..be5d8ae 100644 (file)
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-sdk:2.5.0-STAGING-latest
+image: onap/portal-sdk:2.5.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml
index 7cf7b30..62e095d 100644 (file)
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@ -29,7 +29,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-wms:2.5.0-STAGING-latest
+image: onap/portal-wms:2.5.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required