From 2fb02610e87e511effac28cbf666862a3f75c2bb Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Sun, 3 Mar 2019 13:09:56 -0500 Subject: [PATCH] move non-root id run for CDT container change port 80 to 18080 for non-root user Change-Id: Ib1e987b6aaf537df4d1b08797b928aa0b116fab0 Issue-ID: APPC-1519 Signed-off-by: Taka Cho --- kubernetes/appc/charts/appc-ansible-server/values.yaml | 2 +- kubernetes/appc/charts/appc-cdt/templates/service.yaml | 1 + kubernetes/appc/charts/appc-cdt/values.yaml | 6 +++--- .../config/eteshare/config/integration_robot_properties.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml index 66f39ecfb0..b06d70f758 100644 --- a/kubernetes/appc/charts/appc-ansible-server/values.yaml +++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml @@ -29,7 +29,7 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/ccsdk-ansible-server-image:0.3.3 +image: onap/ccsdk-ansible-server-image:0.4.1-STAGING-latest pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/appc/charts/appc-cdt/templates/service.yaml b/kubernetes/appc/charts/appc-cdt/templates/service.yaml index 735e0f510a..3e0b8894c6 100644 --- a/kubernetes/appc/charts/appc-cdt/templates/service.yaml +++ b/kubernetes/appc/charts/appc-cdt/templates/service.yaml @@ -28,6 +28,7 @@ spec: ports: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} name: {{ .Values.service.name }} {{- else -}} diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml index 517b69ddea..d302c4d630 100644 --- a/kubernetes/appc/charts/appc-cdt/values.yaml +++ b/kubernetes/appc/charts/appc-cdt/values.yaml @@ -26,7 +26,7 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-cdt-image:1.4.3 +image: onap/appc-cdt-image:1.5.0-SNAPSHOT-latest pullPolicy: Always # application configuration @@ -54,8 +54,8 @@ readiness: service: type: NodePort name: appc-cdt - externalPort: 80 - internalPort: 80 + externalPort: 18080 + internalPort: 18080 nodePort: 89 ingress: diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py index 3b65df8b54..8c23ef9e49 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -27,7 +27,7 @@ GLOBAL_APPC_SERVER_PORT = "8282" GLOBAL_APPC_USERNAME = "{{ .Values.appcUsername }}" GLOBAL_APPC_PASSWORD = "{{ .Values.appcPassword }}" GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http" -GLOBAL_APPC_CDT_SERVER_PORT = "80" +GLOBAL_APPC_CDT_SERVER_PORT = "18080" GLOBAL_APPC_CDT_USERNAME = "demo" # sdc info - everything is from the private oam network (also called onap private network) GLOBAL_ASDC_SERVER_PROTOCOL = "http" -- 2.16.6