aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2019-07-16 20:35:27 -0400
committerTaka Cho <takamune.cho@att.com>2019-07-16 20:39:36 -0400
commita5bbf959ca5d68a771490c9cd181083afe38588a (patch)
treec3f0978612ac126eba65080169a65c1b39643ec2
parenta0e80e8e04f3bcbc4cae4a87a34059ee897b09e1 (diff)
move APPC apidoc from http to https
1, changed 8181:8282 to 8443:8443 maps to 30230 port 2, take snapshot-1.6.0 appc image that contains https change 3, chang robot config to https:8443 port Issue-ID: OJSI-113 Change-Id: Icd1c158ae426013cb742b23a50a6d2929ca33d5e Signed-off-by: Taka Cho <takamune.cho@att.com>
-rw-r--r--kubernetes/appc/charts/appc-cdt/values.yaml2
-rw-r--r--kubernetes/appc/templates/service.yaml4
-rw-r--r--kubernetes/appc/values.yaml6
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml
index 7db9527a7f..95034d397a 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.5.3
+image: onap/appc-cdt-image:1.6.0-SNAPSHOT-latest
pullPolicy: Always
# application configuration
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index 32938cc565..fdd31a4ed0 100644
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -41,7 +41,7 @@ spec:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: "{{ .Values.service.portName }}-8282"
+ name: "{{ .Values.service.portName }}-8443"
- port: {{ .Values.service.externalPort2 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
name: "{{ .Values.service.portName }}-1830"
@@ -52,7 +52,7 @@ spec:
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}-8282
+ name: {{ .Values.service.portName }}-8443
- port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
name: {{ .Values.service.portName }}-1830
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 6fa7e65ca6..937642bd99 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -31,7 +31,7 @@ global:
flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/appc-image:1.5.3
+image: onap/appc-image:1.6.0-SNAPSHOT-latest
pullPolicy: Always
# flag to enable debugging - application support required
@@ -120,9 +120,9 @@ service:
name: appc
portName: appc
#targetPort
- internalPort: 8181
+ internalPort: 8443
#port
- externalPort: 8282
+ externalPort: 8443
nodePort: 30
externalPort2: 1830
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 2bbfa565bd..429b83ead3 100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -22,8 +22,8 @@ GLOBAL_AAI_SERVER_PORT = "8443"
GLOBAL_AAI_USERNAME = '{{ .Values.aaiUsername }}'
GLOBAL_AAI_PASSWORD = '{{ .Values.aaiPassword}}'
# appc info - everything is from the private oam network (also called onap private network)
-GLOBAL_APPC_SERVER_PROTOCOL = "http"
-GLOBAL_APPC_SERVER_PORT = "8282"
+GLOBAL_APPC_SERVER_PROTOCOL = "https"
+GLOBAL_APPC_SERVER_PORT = "8443"
GLOBAL_APPC_USERNAME = '{{ .Values.appcUsername }}'
GLOBAL_APPC_PASSWORD = '{{ .Values.appcPassword }}'
GLOBAL_APPC_CDT_SERVER_PROTOCOL = "https"