From 59ce22ddfd867629eed557a32e9e8b880a4725a9 Mon Sep 17 00:00:00 2001 From: jhh 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 --- kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf | 4 ++-- kubernetes/policy/charts/brmsgw/values.yaml | 7 ++++--- kubernetes/policy/charts/drools/charts/nexus/values.yaml | 7 ++++--- kubernetes/policy/charts/drools/templates/service.yaml | 7 +++++-- kubernetes/policy/charts/drools/values.yaml | 6 ++++-- kubernetes/policy/charts/mariadb/templates/service.yaml | 6 +++--- kubernetes/policy/charts/mariadb/values.yaml | 5 +++-- kubernetes/policy/charts/pdp/values.yaml | 2 +- kubernetes/policy/charts/policy-apex-pdp/values.yaml | 6 ++++-- kubernetes/policy/charts/policy-api/templates/service.yaml | 2 +- kubernetes/policy/charts/policy-api/values.yaml | 5 +++-- .../policy/charts/policy-distribution/templates/service.yaml | 5 +++-- kubernetes/policy/charts/policy-distribution/values.yaml | 4 +++- kubernetes/policy/charts/policy-pap/templates/service.yaml | 5 +++-- kubernetes/policy/charts/policy-pap/values.yaml | 4 +++- .../charts/policy-xacml-pdp/resources/config/xacml.properties | 2 +- kubernetes/policy/charts/policy-xacml-pdp/values.yaml | 2 +- kubernetes/policy/templates/service.yaml | 7 +++++-- kubernetes/policy/values.yaml | 6 ++++-- 19 files changed, 57 insertions(+), 35 deletions(-) diff --git a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf index 3952a4cb8d..7f611a1976 100644 --- 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 0001d9a841..9ac8988b1c 100644 --- 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 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 diff --git a/kubernetes/policy/charts/mariadb/templates/service.yaml b/kubernetes/policy/charts/mariadb/templates/service.yaml index 7660ef7580..9d5d13ab04 100644 --- 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 90f5be4e1b..fcd7093607 100644 --- 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 6794681452..116ffe2759 100644 --- 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 70994300db..f9e0c8d5b9 100644 --- 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 81789f26ca..e6ff6fb22e 100644 --- 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 acb9f6bb58..8660d3b336 100644 --- 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 be6b567b7d..5108c55521 100644 --- 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 65f02cba46..935e7e69f1 100644 --- 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 f4a31149f9..6df77816ac 100644 --- 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 4736d1a739..e240460162 100644 --- 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 f4b4f93756..be9a3faa45 100644 --- 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 fcfbab2471..ed74f3d14b 100644 --- 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 221063bd82..8a170070b3 100644 --- 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 48a5dcae1b..df8a3d3ae2 100644 --- 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 -- cgit 1.2.3-korg